[bcl] Remove NET_4_0 defines from class libs

NET_4_0 is always defined now, so the ifdefs are redundant.
I verified the libs are exactly the same after this change, so this is effectively a no-op.

diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs
index d5750ef2ce3394e31018916367bb45f73f1eed3c..6c7919e6ae7db4d7c36cc02ad79cc4ceebc10ab3 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs
@@ -905,7 +905,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                        Assert.AreEqual (0, logger.NormalMessageCount, "Unexpected extra messages found");
                }
 
-#if NET_4_0
                [Test]
                [Category ("NotDotNet")]
                public void TestBeforeAndAfterTargets ()
@@ -960,7 +959,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                        //warnings for referencing unknown targets: NonExistant and Foo
                        Assert.AreEqual (2, logger.WarningsCount, "Expected warnings not raised");
                }
-#endif
 
                [Test]
                public void TestTargetReturns ()

diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CodeTaskFactoryTest.cs b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CodeTaskFactoryTest.cs
index ac5136a17a6c1dd7eabd3f01d05cd25cf274b9b2..e665a41cebfd6fa4869e4fbba2cdc3927fed736d 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CodeTaskFactoryTest.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CodeTaskFactoryTest.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.IO;
 using System.Linq;
@@ -207,4 +206,3 @@ Log.LogWarning(""Color: "" + System.Drawing.Color.CornflowerBlue);
        }
 }
 
-#endif

diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs
index 711bdb26afc536c33d6956c2263eb699d4857e0d..37f26bd7935ba72c214627ebb5efb3f101f6800c 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs
@@ -44,20 +44,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
                public void ARFC (CommandLineBuilderExtension commandLine)
                {
                        base.AddResponseFileCommands (commandLine);
-#if !NET_4_0
-                       string s = commandLine.ToString ();
-                       if (s.Length == 6)
-                               Assert.AreEqual ("/sdk:2", s);
-                       else
-                               Assert.AreEqual ("/sdk:2 ", s.Substring (0, 7));
-
-                       BindingFlags flags = BindingFlags.Instance | BindingFlags.NonPublic;
-                       PropertyInfo pi = typeof (CommandLineBuilderExtension).GetProperty ("CommandLine", flags);
-                       System.Text.StringBuilder sb = (System.Text.StringBuilder) pi.GetValue (commandLine, null);
-                       sb.Length = 0;
-                       if (s.Length > 6)
-                               sb.Append (s.Substring (7));
-#endif
                }
 
                public void ACLC (CommandLineBuilderExtension commandLine)

diff --git a/mcs/class/Microsoft.Build.Utilities/Test/Microsoft.Build.Utilities/ToolLocationHelperTest.cs b/mcs/class/Microsoft.Build.Utilities/Test/Microsoft.Build.Utilities/ToolLocationHelperTest.cs
index fbb567d28271a41a60d4eecde45ef027759a293e..5c49349931654ef3ebf1d1cf458e118d5a16e88d 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Test/Microsoft.Build.Utilities/ToolLocationHelperTest.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Test/Microsoft.Build.Utilities/ToolLocationHelperTest.cs
@@ -1,4 +1,4 @@
-#if NET_4_0
+
 using System;
 using NUnit.Framework;
 using Microsoft.Build.Utilities;
@@ -18,4 +18,3 @@ namespace MonoTests.Microsoft.Build.Utilities
        }
 }
 
-#endif

diff --git a/mcs/class/Mono.Parallel/Test/Mono.Collections.Concurrent/CollectionStressTestHelper.cs b/mcs/class/Mono.Parallel/Test/Mono.Collections.Concurrent/CollectionStressTestHelper.cs
index e05f022bb2dbe4d429bdd06c0ffaa9b0974941c8..289aa8f125758423122cf7273dbc4513ed8d9c6a 100644 (file)
--- a/mcs/class/Mono.Parallel/Test/Mono.Collections.Concurrent/CollectionStressTestHelper.cs
+++ b/mcs/class/Mono.Parallel/Test/Mono.Collections.Concurrent/CollectionStressTestHelper.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // CollectionStressTestHelper.cs
 //  
@@ -126,4 +125,3 @@ namespace MonoTests.Mono.Collections.Concurrent
                }
        }
 }
-#endif

diff --git a/mcs/class/Mono.Parallel/Test/Mono.Collections.Concurrent/ConcurrentSkipListTests.cs b/mcs/class/Mono.Parallel/Test/Mono.Collections.Concurrent/ConcurrentSkipListTests.cs
index b239cdc1d5c1aa6a9402fa8c136b323f9c5149b6..ea69137e0e4f33d22738f26e0cd33ab6d2671879 100644 (file)
--- a/mcs/class/Mono.Parallel/Test/Mono.Collections.Concurrent/ConcurrentSkipListTests.cs
+++ b/mcs/class/Mono.Parallel/Test/Mono.Collections.Concurrent/ConcurrentSkipListTests.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // ConcurrentSkipListTests.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -110,4 +109,3 @@ namespace MonoTests.Mono.Collections.Concurrent
                 
        }
 }
-#endif

diff --git a/mcs/class/Mono.Parallel/Test/Mono.Threading/ParallelTestHelper.cs b/mcs/class/Mono.Parallel/Test/Mono.Threading/ParallelTestHelper.cs
index 2b5bf5b54c4933f610e698cb87ca73cdfa70d136..b0e3839dde566f634209f03a1ec2d3b3d1c3dc1d 100644 (file)
--- a/mcs/class/Mono.Parallel/Test/Mono.Threading/ParallelTestHelper.cs
+++ b/mcs/class/Mono.Parallel/Test/Mono.Threading/ParallelTestHelper.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // TestHelper.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -86,4 +85,3 @@ namespace MonoTests.Mono.Threading.Tasks
                }
        }
 }
-#endif

diff --git a/mcs/class/Mono.Parallel/Test/Mono.Threading/SnziTests.cs b/mcs/class/Mono.Parallel/Test/Mono.Threading/SnziTests.cs
index 30db2ef2995699376433394146c2006fc0e28b38..2b5ccf8ee41b6adc2afde1d142d14e6dceda6248 100644 (file)
--- a/mcs/class/Mono.Parallel/Test/Mono.Threading/SnziTests.cs
+++ b/mcs/class/Mono.Parallel/Test/Mono.Threading/SnziTests.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // SnziTests.cs
 //  
@@ -135,4 +134,3 @@ namespace MonoTests.Mono.Threading
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/AssociationAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/AssociationAttributeTest.cs
index 14c2bff222e72a72215fd26cbb137e193bd78f94..41b8b59680aa72b939be9640cb1605de57b4e4b5 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/AssociationAttributeTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/AssociationAttributeTest.cs
@@ -35,7 +35,6 @@ using NUnit.Framework;
 
 namespace MonoTests.System.ComponentModel.DataAnnotations
 {
-#if NET_4_0
        [TestFixture]
        public class AssociationAttributeTest
        {
@@ -125,5 +124,4 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        Assert.AreEqual (String.Empty, list [0], "#C4-2");
                }
        }
-#endif
 }

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/DisplayAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/DisplayAttributeTest.cs
index 3d54000c5dd8ab3c0ff2daa9a909a4c49d05b1ab..c9db2ac448d8eb8128ab40e3dd2091149470f03c 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/DisplayAttributeTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/DisplayAttributeTest.cs
@@ -8,7 +8,6 @@ using System.Reflection;
 
 namespace MonoTests.System.ComponentModel.DataAnnotations
 {
-#if NET_4_0
        public class AttributeTargetValidation
        {
                [Display(ResourceType = typeof(GoodResources), Name = "NameKey")]
@@ -274,5 +273,4 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        Assert.Fail();
                }
        }
-#endif
 }

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/EnumDataTypeAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/EnumDataTypeAttributeTest.cs
index cf7c641f9fede6ac070dcf5984f418a1b3e2c80e..e3ae0837cfc5ce510209afebcb6df534894fedee 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/EnumDataTypeAttributeTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/EnumDataTypeAttributeTest.cs
@@ -35,7 +35,6 @@ using NUnit.Framework;
 
 namespace MonoTests.System.ComponentModel.DataAnnotations
 {
-#if NET_4_0
        [TestFixture]
        public class EnumDataTypeAttributeTest
        {
@@ -133,5 +132,4 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                Five = 8,
                Six = 16
        }
-#endif
 }

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/FilterUIHintAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/FilterUIHintAttributeTest.cs
index 938f4e8fbcbc7860c1b13e912d558f0cf4d06495..9b7508551bab89d04e31986997d1eee6462200f1 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/FilterUIHintAttributeTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/FilterUIHintAttributeTest.cs
@@ -5,7 +5,6 @@
 
 // https://silverlight.svn.codeplex.com/svn/Release/Silverlight4/Source/RiaClient.Tests/System.ComponentModel.DataAnnotations/FilterUIHintAttributeTest.cs
 
-#if NET_4_0
 
 using System;
 using System.ComponentModel;
@@ -90,4 +89,3 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
     }
 }
 
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RangeAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RangeAttributeTest.cs
index b5d0241e728a8ac07754536f83210f265768a98d..1f297263792be25b435e1437d4798e4c9b6a485e 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RangeAttributeTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RangeAttributeTest.cs
@@ -104,26 +104,16 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
 
                        Assert.IsNotNull (attr.Minimum, "#A1-1");
                        Assert.IsNotNull (attr.Maximum, "#A1-2");
-#if NET_4_0
                        Assert.AreEqual (typeof (string), attr.Minimum.GetType (), "#A2-1");
                        Assert.AreEqual (typeof (string), attr.Maximum.GetType (), "#A2-2");
                        Assert.AreEqual ("-10", attr.Minimum, "#A3-1");
                        Assert.AreEqual ("10", attr.Maximum, "#A3-2");
-#else
-                       Assert.AreEqual (typeof (int), attr.Minimum.GetType (), "#A2-1");
-                       Assert.AreEqual (typeof (int), attr.Maximum.GetType (), "#A2-2");
-                       Assert.AreEqual (-10, attr.Minimum, "#A3-1");
-                       Assert.AreEqual (10, attr.Maximum, "#A3-2");
-#endif
                        Assert.IsNotNull (attr.OperandType, "#A4-1");
                        Assert.AreEqual (typeof (int), attr.OperandType, "#A4-2");
                }
 
                [Test]
                //LAMESPEC: documented to throw
-#if !NET_4_0
-               [ExpectedException (typeof (ArgumentNullException))]
-#endif
                public void Constructor_Type_String_String_Null_Type ()
                {
                        var attr = new DA.RangeAttribute (null, "-10", "10");
@@ -144,7 +134,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                                attr.IsValid ("zero");
                        }, "#A1-5");
                        Assert.IsTrue (attr.IsValid (null), "#A1-6");
-#if NET_4_0
                        attr = new DA.RangeAttribute (typeof (int), "minus ten", "ten");
                        AssertExtensions.Throws<Exception> (() => {
                                attr.IsValid ("0");
@@ -196,31 +185,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        attr.IsValid (12);
                        Assert.AreEqual (typeof (int), attr.Minimum.GetType (), "#A7-1");
                        Assert.AreEqual (typeof (int), attr.Maximum.GetType (), "#A7-2");
-#else
-                       AssertExtensions.Throws<Exception> (() => {
-                               attr = new DA.RangeAttribute (typeof (int), "minus ten", "ten");
-                       }, "#A2");
-
-                       AssertExtensions.Throws<ArgumentException> (() => {
-                               attr = new DA.RangeAttribute (typeof (RangeAttributeTest), "-10", "10");
-                       }, "#A3");
-
-                       AssertExtensions.Throws<ArgumentNullException> (() => {
-                               attr = new DA.RangeAttribute (null, "-10", "10");
-                       }, "#A4");
-
-                       AssertExtensions.Throws<NotSupportedException> (() => {
-                               attr = new DA.RangeAttribute (typeof (int), null, "10");
-                       }, "#A5-1");
-
-                       AssertExtensions.Throws<NotSupportedException> (() => {
-                               attr = new DA.RangeAttribute (typeof (int), "10", null);
-                       }, "#A5-2");
-
-                       attr = new DA.RangeAttribute (typeof (int), "-10", "10");
-                       Assert.AreEqual (typeof (int), attr.Minimum.GetType (), "#A6-1");
-                       Assert.AreEqual (typeof (int), attr.Maximum.GetType (), "#A6-2");
-#endif
                }
 
                [Test]
@@ -232,19 +196,10 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
 
                        attr.ErrorMessage = "Param 0: {0}";
                        Assert.AreEqual ("Param 0: MyField", attr.FormatErrorMessage ("MyField"), "#A2-1");
-#if !NET_4_0
-                       attr = new DA.RangeAttribute (-10, 10);
-#endif
                        attr.ErrorMessage = "Param 0: {0}; Param 1: {1}";
                        Assert.AreEqual ("Param 0: MyField; Param 1: -10", attr.FormatErrorMessage ("MyField"), "#A2-2");
-#if !NET_4_0
-                       attr = new DA.RangeAttribute (-10, 10);
-#endif
                        attr.ErrorMessage = "Param 0: {0}; Param 1: {1}; Param 2: {2}";
                        Assert.AreEqual ("Param 0: MyField; Param 1: -10; Param 2: 10", attr.FormatErrorMessage ("MyField"), "#A2-3");
-#if !NET_4_0
-                       attr = new DA.RangeAttribute (-10, 10);
-#endif
                        attr.ErrorMessage = "Param 0: {0}; Param 1: {1}; Param 2: {2}; Param 3: {3}";
                        AssertExtensions.Throws<FormatException> (() => {
                                attr.FormatErrorMessage ("MyField");

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RegularExpressionAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RegularExpressionAttributeTest.cs
index 163e1a738b76aae3e4cc8d342826aabe86e96488..2462517cffa24875aad607175647b6923ef635c3 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RegularExpressionAttributeTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RegularExpressionAttributeTest.cs
@@ -68,15 +68,9 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                                rea.FormatErrorMessage ("MyField"), 
                                "Error message not correctly formatted.");
 
-#if !NET_4_0
-                       rea = new RegularExpressionAttributePoker (@"[A-Za-z]");
-#endif
                        rea.ErrorMessage = "Param 0: {0}";
                        Assert.AreEqual ("Param 0: MyField", rea.FormatErrorMessage ("MyField"), "Error message not correctly updated.");
 
-#if !NET_4_0
-                       rea = new RegularExpressionAttributePoker (@"[A-Za-z]");
-#endif
                        rea.ErrorMessage = "Param 0: {0}; Param 1: {1}";
                        Assert.AreEqual ("Param 0: MyField; Param 1: [A-Za-z]", rea.FormatErrorMessage ("MyField"), "Error message not correctly updated.");
                        Assert.AreEqual ("Param 0: ; Param 1: [A-Za-z]", rea.FormatErrorMessage (null), "Error message fails on null value.");

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RequiredAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RequiredAttributeTest.cs
index 7930002ab0ffafabee486f89f8eecb4b551e6492..a26b553071710340482cb54be660f26c56a4681a 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RequiredAttributeTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RequiredAttributeTest.cs
@@ -45,12 +45,9 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        Assert.IsFalse (attr.IsValid (String.Empty), "#A2");
                        Assert.IsTrue (attr.IsValid ("string"), "#A3");
                        Assert.IsTrue (attr.IsValid (1), "#A4");
-#if NET_4_0
                        attr.AllowEmptyStrings = true;
                        Assert.IsTrue (attr.IsValid (String.Empty), "#A5");
-#endif
                }
-#if NET_4_0
                [Test]
                public void AllowEmptyStrings ()
                {
@@ -60,6 +57,5 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        attr.AllowEmptyStrings = true;
                        Assert.IsTrue (attr.AllowEmptyStrings, "#A2");
                }
-#endif
        }
 }

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/StringLengthAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/StringLengthAttributeTest.cs
index 664e440104aac79a099dd043d3a402ca725b0927..61b61683e695f286c2d661aaaa309fa49c0b0ed6 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/StringLengthAttributeTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/StringLengthAttributeTest.cs
@@ -58,16 +58,10 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        Assert.AreEqual (10, sla.MaximumLength, "#A1-1");
                        Assert.AreEqual (null, sla.ErrorMessage, "#A1-2");
                        Assert.AreEqual ("The field {0} must be a string with a maximum length of {1}.", sla.GetErrorMessageString (), "#A1-3");
-#if NET_4_0
                        Assert.AreEqual (0, sla.MinimumLength, "#A1-4");
 
                        sla = new StringLengthAttributePoker (-10);
                        Assert.AreEqual (-10, sla.MaximumLength, "#B1");
-#else
-                       AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
-                               sla = new StringLengthAttributePoker (-10);
-                       }, "#B1");
-#endif
                        sla = new StringLengthAttributePoker (0);
                        Assert.AreEqual (0, sla.MaximumLength, "#C1");
                }
@@ -78,14 +72,8 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        var sla = new StringLengthAttributePoker (10);
 
                        Assert.AreEqual ("The field MyField must be a string with a maximum length of 10.", sla.FormatErrorMessage ("MyField"), "#A1-1");
-#if !NET_4_0
-                       sla = new StringLengthAttributePoker (10);
-#endif
                        sla.ErrorMessage = "Param 0: {0}";
                        Assert.AreEqual ("Param 0: MyField", sla.FormatErrorMessage ("MyField"), "#A1-2");
-#if !NET_4_0
-                       sla = new StringLengthAttributePoker (10);
-#endif
                        sla.ErrorMessage = "Param 0: {0}; Param 1: {1}";
                        Assert.AreEqual ("Param 0: MyField; Param 1: 10", sla.FormatErrorMessage ("MyField"), "#A1-2");
                        Assert.AreEqual ("Param 0: ; Param 1: 10", sla.FormatErrorMessage (null), "#A1-3");
@@ -112,7 +100,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        Assert.IsTrue (sla.IsValid (null), "#B1-1");
                        Assert.IsTrue (sla.IsValid (String.Empty), "#B1-2");
                        Assert.IsFalse (sla.IsValid ("string"), "#B1-3");
-#if NET_4_0
                        sla = new StringLengthAttributePoker (-10);
                        AssertExtensions.Throws <InvalidOperationException> (() => {
                                sla.IsValid ("123");
@@ -127,7 +114,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        sla.MinimumLength = 5;
                        Assert.IsFalse (sla.IsValid ("123"), "#C2-1");
                        Assert.IsTrue (sla.IsValid ("12345"), "#C2-2");
-#endif
                }
        }
 }

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/UIHintAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/UIHintAttributeTest.cs
index a6c99a3ba2b78e33d7d0436392c1dd37804729e6..a08c8b1d3929d1d4704ffa5a0559a5778daca795 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/UIHintAttributeTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/UIHintAttributeTest.cs
@@ -5,7 +5,6 @@
 
 // https://silverlight.svn.codeplex.com/svn/Release/Silverlight4/Source/RiaClient.Tests/System.ComponentModel.DataAnnotations/UIHintAttributeTest.cs
 
-#if NET_4_0
 
 using System;
 using System.ComponentModel;
@@ -136,4 +135,3 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
     }
 }
 
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidationAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidationAttributeTest.cs
index 7e98ecca3f32da0d632353cdb65d9660fac4e81c..cc19b39d2cf45fb0feddabceadf8bd2aa5dc39c9 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidationAttributeTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidationAttributeTest.cs
@@ -89,46 +89,11 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
 
                        attr.ErrorMessage = "Test";
                        Assert.AreEqual ("Test", attr.ErrorMessage, "#A2");
-#if NET_4_0
                        attr.ErrorMessage = String.Empty;
                        Assert.AreEqual (String.Empty, attr.ErrorMessage, "#A3");
 
                        attr.ErrorMessage = null;
                        Assert.IsNull (attr.ErrorMessage, "#A4");
-#else
-                       try {
-                               attr.ErrorMessage = String.Empty;
-                               Assert.Fail ("#A3");
-                       } catch (InvalidOperationException) {
-                               // success
-                       }
-
-                       attr = new ValidateFooAttribute ("Test");
-                       try {
-                               attr.ErrorMessage = null;
-                               Assert.Fail ("#A4");
-                       } catch (ArgumentException) {
-                               // success
-                       }
-
-                       attr = new ValidateFooAttribute ("Test");
-                       try {
-                               attr.ErrorMessage = String.Empty;
-                               Assert.Fail ("#A4");
-                       } catch (ArgumentException) {
-                               // success
-                       }
-
-                       attr = new ValidateFooAttribute ();
-                       attr.ErrorMessageResourceName = "ErrorProperty1";
-
-                       try {
-                               attr.ErrorMessage = "Test Message";
-                               Assert.Fail ("#E1");
-                       } catch (InvalidOperationException) {
-                               // success
-                       }
-#endif
                        
                }
 
@@ -142,47 +107,12 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        attr.ErrorMessageResourceName = "Test";
                        Assert.IsNotNull (attr.ErrorMessageResourceName, "#A2-1");
                        Assert.AreEqual ("Test", attr.ErrorMessageResourceName, "#A2-2");
-#if NET_4_0
                        attr.ErrorMessageResourceName = String.Empty;
                        Assert.IsNotNull (attr.ErrorMessageResourceName, "#A3-1");
                        Assert.AreEqual (String.Empty, attr.ErrorMessageResourceName, "#A3-2");
 
                        attr.ErrorMessageResourceName = null;
                        Assert.IsNull (attr.ErrorMessageResourceName, "#A3-1");
-#else
-                       try {
-                               attr.ErrorMessageResourceName = String.Empty;
-                               Assert.Fail ("#A3-1");
-                       } catch (InvalidOperationException) {
-                               // success
-                       }
-
-                       attr = new ValidateFooAttribute ("Test");
-                       try {
-                               attr.ErrorMessageResourceName = String.Empty;
-                               Assert.Fail ("#A3-2");
-                       } catch (ArgumentException) {
-                               // success
-                       }
-
-                       attr = new ValidateFooAttribute ("Test");
-                       try {
-                               attr.ErrorMessageResourceName = null;
-                               Assert.Fail ("#A3-3");
-                       } catch (ArgumentException) {
-                               // success
-                       }
-
-                       attr = new ValidateFooAttribute ();
-                       attr.ErrorMessageResourceType = typeof (FooErrorMessageProvider);
-
-                       try {
-                               attr.ErrorMessageResourceName = "NoSuchProperty";
-                               Assert.Fail ("#A3-4");
-                       } catch (InvalidOperationException) {
-                               // success
-                       }
-#endif
                }
 
                [Test]
@@ -195,17 +125,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        attr.ErrorMessageResourceType = typeof (FooErrorMessageProvider);
                        Assert.IsNotNull (attr.ErrorMessageResourceType, "#A2-1");
                        Assert.AreEqual (typeof (FooErrorMessageProvider), attr.ErrorMessageResourceType, "#A2-2");
-#if !NET_4_0
-                       attr = new ValidateFooAttribute ();
-                       attr.ErrorMessageResourceName = "NoSuchProperty";
-                       
-                       try {
-                               attr.ErrorMessageResourceType = typeof (FooErrorMessageProvider);
-                               Assert.Fail ("#A3");
-                       } catch (InvalidOperationException) {
-                               // success
-                       }
-#endif
                }
 
                [Test]
@@ -224,7 +143,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        } catch (InvalidOperationException) {
                                // success
                        }
-#if NET_4_0
                        attr = new ValidateFooAttribute ();
                        attr.ErrorMessageResourceName = String.Empty;
                        try {
@@ -324,7 +242,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        } catch (InvalidOperationException) {
                                // success
                        }
-#endif
 
                        attr = new ValidateFooAttribute ();
                        attr.ErrorMessageResourceName = "ErrorProperty1";
@@ -341,7 +258,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        attr.ErrorMessageResourceType = typeof (FooErrorMessageProvider);
                        Assert.IsNotNull (attr.GetErrorMessageString (), "#D1-3");
                        Assert.AreEqual ("Error Message 1", attr.GetErrorMessageString (), "#D1-4");
-#if NET_4_0
                        attr.ErrorMessage = "Test Message";
                        try {
                                attr.GetErrorMessageString ();
@@ -349,7 +265,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        } catch (InvalidOperationException) {
                                // success
                        }
-#endif
                }
 
                [Test]
@@ -363,31 +278,20 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        attr.ErrorMessage = "Test: {0}";
                        Assert.IsNotNull (attr.FormatErrorMessage ("SomeField"), "#A2-1");
                        Assert.AreEqual ("Test: SomeField", attr.FormatErrorMessage ("SomeField"), "#A2-2");
-#if !NET_4_0
-                       attr = new ValidateFooAttribute ();
-#else
                        attr.ErrorMessage = null;
-#endif
                        attr.ErrorMessageResourceName = "ErrorProperty1";
                        attr.ErrorMessageResourceType = typeof (FooErrorMessageProvider);
                        Assert.IsNotNull (attr.FormatErrorMessage ("SomeField"), "#B1-1");
                        Assert.AreEqual ("Error Message 1", attr.FormatErrorMessage ("SomeField"), "#B1-2");
-#if !NET_4_0
-                       attr = new ValidateFooAttribute ();
-#endif
                        attr.ErrorMessageResourceName = "ErrorProperty6";
                        attr.ErrorMessageResourceType = typeof (FooErrorMessageProvider);
                        Assert.IsNotNull (attr.FormatErrorMessage ("SomeField"), "#B2-1");
                        Assert.AreEqual ("Error Message 6: SomeField", attr.FormatErrorMessage ("SomeField"), "#B2-2");
-#if !NET_4_0
-                       attr = new ValidateFooAttribute ();
-#endif
                        attr.ErrorMessageResourceName = "ErrorProperty6";
                        attr.ErrorMessageResourceType = typeof (FooErrorMessageProvider);
                        Assert.IsNotNull (attr.FormatErrorMessage ("SomeField"), "#B3-1");
                        Assert.AreEqual ("Error Message 6: ", attr.FormatErrorMessage (null), "#B3-2");
                }
-#if NET_4_0
                [Test]
                public void GetValidationResult ()
                {
@@ -556,7 +460,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        Assert.AreEqual ("bool IsValid (object value)", attr.Calls [1], "#A2-3");
                        Assert.AreEqual ("string FormatErrorMessage (string name)", attr.Calls [2], "#A2-4");
                }
-#endif
                [Test]
                public void Validate_Object_String ()
                {
@@ -593,12 +496,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                {
                        return ErrorMessageString;
                }
-#if !NET_4_0
-               public override bool IsValid (object value)
-               {
-                       return value != null;
-               }
-#endif
        }
 
        class ValidateBarAttribute : ValidateFooAttribute
@@ -613,7 +510,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                {
                        return value != null;
                }
-#if NET_4_0
                protected override ValidationResult IsValid (object value, ValidationContext validationContext)
                {
                        if (!IsValid (value))
@@ -625,7 +521,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                {
                        return base.IsValid (value, validationContext);
                }
-#endif
        }
 
        class ValidateBazAttribute : ValidateBarAttribute
@@ -637,20 +532,17 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        Calls.Add ("bool IsValid (object value)");
                        return base.IsValid (value);
                }
-#if NET_4_0
                protected override ValidationResult IsValid (object value, ValidationContext validationContext)
                {
                        Calls.Add ("ValidationResult IsValid (object value, ValidationContext validationContext)");
                        return base.IsValid (value, validationContext);
                }
-#endif
                public override string FormatErrorMessage (string name)
                {
                        Calls.Add ("string FormatErrorMessage (string name)");
                        return base.FormatErrorMessage (name);
                }
        }
-#if NET_4_0
        class ValidateSomethingAttribute : ValidationAttribute
        {
                public override bool IsValid (object value)
@@ -670,7 +562,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        return IsValid (value, validationContext);
                }
        }
-#endif
        class FooErrorMessageProvider
        {
                public static string ErrorProperty1

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidationContextTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidationContextTest.cs
index 2a73735bf89e201c67a9310d5ed350259ef7b2f4..e6d69cd738175e930d2eddee76af413dd5269858 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidationContextTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidationContextTest.cs
@@ -35,7 +35,6 @@ using NUnit.Framework;
 
 namespace MonoTests.System.ComponentModel.DataAnnotations
 {
-#if NET_4_0
        [TestFixture]
        public class ValidationContextTest
        {
@@ -238,5 +237,4 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        return null;
                }
        }
-#endif
 }

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidationResultTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidationResultTest.cs
index 05ddfa9f827be022b4fa7c6efec58476653cd8ac..ca3774a423ddeebefc4063932c46197fb7a3cb01 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidationResultTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidationResultTest.cs
@@ -35,7 +35,6 @@ using NUnit.Framework;
 
 namespace MonoTests.System.ComponentModel.DataAnnotations
 {
-#if NET_4_0
        [TestFixture]
        public class ValidationResultTest
        {
@@ -93,5 +92,4 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        Assert.IsNull (success, "#A1");
                }
        }
-#endif
 }

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidatorTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidatorTest.cs
index 0c3787f2f54ad5ffecb7ef1a220adbaf34f7da34..abb1e9f5156c345a5da74b38734c4f0f8e6c0531 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidatorTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/ValidatorTest.cs
@@ -33,7 +33,6 @@ using MonoTests.Common;
 
 namespace MonoTests.System.ComponentModel.DataAnnotations
 {
-#if NET_4_0
        [TestFixture]
        public class ValidatorTest
        {
@@ -1233,5 +1232,4 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        }
                }
        }
-#endif
 }

diff --git a/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationPermissionTest.cs b/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationPermissionTest.cs
index 35af604b15a306b469ce0c7b874e2131a7a8e140..e98ed97f1d41dabbc5c81316a398ca12e4c07f02 100644 (file)
--- a/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationPermissionTest.cs
+++ b/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationPermissionTest.cs
@@ -143,27 +143,15 @@ namespace MonoTests.System.Configuration {
                {
                        ConfigurationPermission p = new ConfigurationPermission (PermissionState.Unrestricted);
 
-#if NET_4_0
                        Assert.AreEqual(
                                        "<IPermission class=\"System.Configuration.ConfigurationPermission, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"\nversion=\"1\"\nUnrestricted=\"true\"/>\n",
                                        p.ToString().Replace ("\r\n", "\n"), "A1");
-#else
-                       Assert.AreEqual (
-                                       "<IPermission class=\"System.Configuration.ConfigurationPermission, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"\nversion=\"1\"\nUnrestricted=\"true\"/>\n",
-                                       p.ToString ().Replace ("\r\n", "\n"), "A1");
-#endif
 
                        p = new ConfigurationPermission (PermissionState.None);
 
-#if NET_4_0
                        Assert.AreEqual (
                                         "<IPermission class=\"System.Configuration.ConfigurationPermission, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"\nversion=\"1\"/>\n",
                                         p.ToString().Replace ("\r\n", "\n"), "A2");
-#else
-                       Assert.AreEqual (
-                                        "<IPermission class=\"System.Configuration.ConfigurationPermission, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"\nversion=\"1\"/>\n",
-                                        p.ToString ().Replace ("\r\n", "\n"), "A2");
-#endif
                }
        }
 }

diff --git a/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs b/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs
index 3e7f235678609c688d853c781cea8b628d9195bb..b61fcb2bf4dbda1e403cf6b0c84d9539361b605d 100644 (file)
--- a/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs
+++ b/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs
@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.IO;
@@ -411,5 +410,4 @@ namespace MonoTests.System.IO.MemoryMappedFiles {
        }
 }
 
-#endif
 

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest.cs
index 37d7a00082cc9bf300a725f3527b00022a47b11a..d4d66bb7ff7fd8b9f45815058f21aa27ae2fbd12 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest.cs
@@ -133,9 +133,6 @@ namespace MonoTests.System.Linq.Expressions {
                        var p = Expression.Parameter (typeof (string), null);
                        Assert.AreEqual (null, p.Name);
                        Assert.AreEqual (typeof (string), p.Type);
-#if !NET_4_0
-                       Assert.AreEqual ("<param>", p.ToString ());
-#endif
                }
 
                [Test]
@@ -144,9 +141,6 @@ namespace MonoTests.System.Linq.Expressions {
                        var p = Expression.Parameter (typeof (string), "");
                        Assert.AreEqual ("", p.Name);
                        Assert.AreEqual (typeof (string), p.Type);
-#if !NET_4_0
-                       Assert.AreEqual ("", p.ToString ());
-#endif
                }
 
                [Test]
@@ -199,9 +193,6 @@ namespace MonoTests.System.Linq.Expressions {
 
                        Assert.AreEqual (typeof (Func<string, string>), identity.GetType ());
                        Assert.IsNotNull (identity.Target);
-#if !NET_4_0
-                       Assert.AreEqual (typeof (ExecutionScope), identity.Target.GetType ());
-#endif
                }
 
                class Foo {
@@ -217,39 +208,6 @@ namespace MonoTests.System.Linq.Expressions {
                        }
                }
 
-#if !NET_4_0
-               [Test]
-               public void GlobalsInScope ()
-               {
-                       var foo = new Foo { gazonk = "gazonk" };
-                       var bar = new Bar { baz = 42 };
-
-                       var l = Expression.Lambda<Func<string>> (
-                               Expression.Call (
-                                       typeof (string).GetMethod ("Concat", new [] { typeof (string), typeof (string) }),
-                                       Expression.Field (Expression.Constant (foo), typeof (Foo).GetField ("gazonk")),
-                                       Expression.Call (Expression.Constant (bar), typeof (Bar).GetMethod ("ToString"))));
-
-                       var del = l.Compile ();
-
-                       var scope = del.Target as ExecutionScope;
-
-                       Assert.IsNotNull (scope);
-
-                       var globals = scope.Globals;
-
-                       Assert.IsNotNull (globals);
-
-                       Assert.AreEqual (2, globals.Length);
-                       Assert.AreEqual (typeof (StrongBox<Foo>), globals [0].GetType ());
-                       Assert.AreEqual (typeof (StrongBox<Bar>), globals [1].GetType ());
-
-                       Assert.AreEqual (foo, ((StrongBox<Foo>) globals [0]).Value);
-                       Assert.AreEqual (bar, ((StrongBox<Bar>) globals [1]).Value);
-
-                       Assert.AreEqual ("gazonk42", del ());
-               }
-#endif
 
                [Test]
                public void SimpleHoistedParameter ()

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_AddChecked.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_AddChecked.cs
index d56fe5e933afce27668db069684f0e039356d30b..549e7308a32aae04b8620838a5c904859057be57 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_AddChecked.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_AddChecked.cs
@@ -194,12 +194,6 @@ namespace MonoTests.System.Linq.Expressions
                        // These are invalid:
                        InvalidOperation<byte> (Byte.MaxValue, 2);
                        InvalidOperation<sbyte> (SByte.MaxValue, 2);
-#if !NET_4_0
-                       // Stuff that just fits in 32 bits, does not overflow:
-                       MustNotOverflow<short> (Int16.MaxValue, 2);
-                       MustNotOverflow<short> (Int16.MaxValue, 2);
-                       MustNotOverflow<ushort> (UInt16.MaxValue, 2);
-#endif
                        // Doubles, floats, do not overflow
                        MustNotOverflow<float> (Single.MaxValue, 1);
                        MustNotOverflow<double> (Double.MaxValue, 1);

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_AndAlso.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_AndAlso.cs
index 1384adc7501a54e5a5f9be19152c766afcd6dc89..01f3cbf7b6fec77d4b072e7458fc532e52da8d75 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_AndAlso.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_AndAlso.cs
@@ -80,9 +80,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (ExpressionType.AndAlso, expr.NodeType, "AndAlso#01");
                        Assert.AreEqual (typeof (bool), expr.Type, "AndAlso#02");
                        Assert.IsNull (expr.Method, "AndAlso#03");
-#if !NET_4_0
-                       Assert.AreEqual ("(True && False)", expr.ToString(), "AndAlso#04");
-#endif
                }
 
                [Test]
@@ -97,10 +94,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (typeof (OpClass), expr.Type, "AndAlso#06");
                        Assert.AreEqual (mi, expr.Method, "AndAlso#07");
                        Assert.AreEqual ("op_BitwiseAnd", expr.Method.Name, "AndAlso#08");
-#if !NET_4_0
-                       Assert.AreEqual ("(value(MonoTests.System.Linq.Expressions.OpClass) && value(MonoTests.System.Linq.Expressions.OpClass))",
-                               expr.ToString(), "AndAlso#09");
-#endif
                }
 
                [Test]

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Call.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Call.cs
index e4cd69c59778a525e26c09bd89a2c4612a086061..1edb2fa98eca01cbaac72ac28d970ab1a013a35d 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Call.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Call.cs
@@ -87,11 +87,7 @@ namespace MonoTests.System.Linq.Expressions {
                }
 
                [Test]
-#if NET_4_0
                [ExpectedException (typeof (ArgumentException))]
-#else
-               [ExpectedException (typeof (ArgumentNullException))]
-#endif
                public void ArgInstanceNullForNonStaticMethod ()
                {
                        Expression.Call (null, typeof (object).GetMethod ("ToString"));
@@ -292,18 +288,6 @@ namespace MonoTests.System.Linq.Expressions {
                {
                        return (int) (i as ConstantExpression).Value;
                }
-#if !NET_4_0 // dlr bug 5875
-               [Test]
-               public void CallMethodWithExpressionParameter ()
-               {
-                       var call = Expression.Call (GetType ().GetMethod ("Bang"), Expression.Constant (42));
-                       Assert.AreEqual (ExpressionType.Quote, call.Arguments [0].NodeType);
-
-                       var l = Expression.Lambda<Func<int>> (call).Compile ();
-
-                       Assert.AreEqual (42, l ());
-               }
-#endif
                static bool fout_called = false;
 
                public static int FooOut (out int x)

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Convert.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Convert.cs
index 7fb96f71519940f299885b81aef6aebf1a1d8c46..d2cbd1013ab2a4c5edc7845195e0b495f25a2a1d 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Convert.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Convert.cs
@@ -81,16 +81,10 @@ namespace MonoTests.System.Linq.Expressions {
 
                        var conv = Expression.Convert (p, typeof (ITzap));
                        Assert.AreEqual (typeof (ITzap), conv.Type);
-#if !NET_4_0
-                       Assert.AreEqual ("Convert(<param>)", conv.ToString ());
-#endif
                        p = Expression.Parameter (typeof (ITzap), null);
                        conv = Expression.Convert (p, typeof (IFoo));
 
                        Assert.AreEqual (typeof (IFoo), conv.Type);
-#if !NET_4_0
-                       Assert.AreEqual ("Convert(<param>)", conv.ToString ());
-#endif
                }
 
                [Test]

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Equal.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Equal.cs
index 497955c4a4e2873a32175a4371fd195698cc11fa..ac32152973f1d06c45fb897253f98fb089d1f1ad 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Equal.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Equal.cs
@@ -76,9 +76,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (ExpressionType.Equal, expr.NodeType);
                        Assert.AreEqual (typeof (bool), expr.Type);
                        Assert.IsNull (expr.Method);
-#if !NET_4_0
-                       Assert.AreEqual ("(1 = 2)", expr.ToString ());
-#endif
                }
 
                [Test]
@@ -107,9 +104,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (true, expr.IsLifted);
                        Assert.AreEqual (false, expr.IsLiftedToNull);
                        Assert.IsNull (expr.Method);
-#if !NET_4_0
-                       Assert.AreEqual ("(1 = 2)", expr.ToString ());
-#endif
                }
 
                [Test]
@@ -126,9 +120,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (true, expr.IsLifted);
                        Assert.AreEqual (true, expr.IsLiftedToNull);
                        Assert.IsNull (expr.Method);
-#if !NET_4_0
-                       Assert.AreEqual ("(1 = 2)", expr.ToString ());
-#endif
                }
 
                [Test]
@@ -154,9 +145,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (typeof (bool), expr.Type);
                        Assert.AreEqual (mi, expr.Method);
                        Assert.AreEqual ("op_Equality", expr.Method.Name);
-#if !NET_4_0
-                       Assert.AreEqual ("(value(MonoTests.System.Linq.Expressions.OpClass) = value(MonoTests.System.Linq.Expressions.OpClass))", expr.ToString ());
-#endif
                }
 
                [Test]

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Lambda.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Lambda.cs
index 8c83e312ec13b1abf17b93da7e581be6468b1e24..07b8f0381828a76eeb8c0f031b36434dd2ec3697 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Lambda.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Lambda.cs
@@ -267,19 +267,5 @@ namespace MonoTests.System.Linq.Expressions
 
                        Assert.AreEqual (5, l (1));
                }
-#if !NET_4_0 // dlr bug 5875
-               [Test]
-               public void LambdaReturningExpression ()
-               {
-                       var l = Expression.Lambda<Func<Expression>> (Expression.Constant (42));
-                       Assert.AreEqual (ExpressionType.Quote, l.Body.NodeType);
-
-                       var quoter = l.Compile ();
-
-                       var q = quoter ();
-
-                       Assert.AreEqual (ExpressionType.Constant, q.NodeType);
-               }
-#endif
        }
 }

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_OrElse.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_OrElse.cs
index ddef13f4702f3d0db7191bb95668e8e68a95347c..44e89e185c2d779ecaece576ff8082713370fd65 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_OrElse.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_OrElse.cs
@@ -80,9 +80,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (ExpressionType.OrElse, expr.NodeType, "OrElse#01");
                        Assert.AreEqual (typeof (bool), expr.Type, "OrElse#02");
                        Assert.IsNull (expr.Method, "OrElse#03");
-#if !NET_4_0
-                       Assert.AreEqual ("(True || False)", expr.ToString(), "OrElse#04");
-#endif
                }
 
                [Test]
@@ -97,10 +94,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (typeof (OpClass), expr.Type, "OrElse#06");
                        Assert.AreEqual (mi, expr.Method, "OrElse#07");
                        Assert.AreEqual ("op_BitwiseOr", expr.Method.Name, "OrElse#08");
-#if !NET_4_0
-                       Assert.AreEqual ("(value(MonoTests.System.Linq.Expressions.OpClass) || value(MonoTests.System.Linq.Expressions.OpClass))",
-                               expr.ToString(), "OrElse#09");
-#endif
                }
 
                public class BrokenMethod {
@@ -283,29 +276,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.AreEqual (new Slot (64), orelse (new Slot (64), new Slot (64)));
                        Assert.AreEqual (new Slot (32), orelse (new Slot (32), new Slot (64)));
                }
-#if !NET_4_0 // dlr bug 5867
-               [Test]
-               public void UserDefinedOrElseLiftedToNull ()
-               {
-                       var l = Expression.Parameter (typeof (Slot?), "l");
-                       var r = Expression.Parameter (typeof (Slot?), "r");
-
-                       var method = typeof (Slot).GetMethod ("op_BitwiseOr");
-
-                       var node = Expression.OrElse (l, r, method);
-                       Assert.IsTrue (node.IsLifted);
-                       Assert.IsTrue (node.IsLiftedToNull);
-                       Assert.AreEqual (method, node.Method);
-
-                       var orelse = Expression.Lambda<Func<Slot?, Slot?, Slot?>> (node, l, r).Compile ();
-
-                       Assert.AreEqual (new Slot (64), orelse (new Slot (64), new Slot (64)));
-                       Assert.AreEqual (new Slot (32), orelse (new Slot (32), new Slot (64)));
-                       Assert.AreEqual (new Slot (64), orelse (null, new Slot (64)));
-                       Assert.AreEqual (new Slot (32), orelse (new Slot (32), null));
-                       Assert.AreEqual (null, orelse (null, null));
-               }
-#endif
                [Test]
                [Category ("NotWorkingInterpreter")]
                public void UserDefinedOrElseShortCircuit ()

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Quote.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Quote.cs
index d3de170e0dad3953f2595a0e8a1580c616ecf694..d32918d75b2299596928ae85c5694f1720715244 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Quote.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Quote.cs
@@ -37,23 +37,12 @@ namespace MonoTests.System.Linq.Expressions
                        Expression.Quote (null);
                }
 
-#if !NET_4_0
-               [Test]
-               public void QuoteConstant ()
-               {
-                       UnaryExpression expr = Expression.Quote (Expression.Constant (1));
-                       Assert.AreEqual (ExpressionType.Quote, expr.NodeType, "Quote#01");
-                       Assert.AreEqual (typeof (ConstantExpression), expr.Type, "Quote#02");
-                       Assert.AreEqual ("1", expr.ToString(), "Quote#03");
-               }
-#else
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void QuoteConstant ()
                {
                        Expression.Quote (Expression.Constant (1));
                }
-#endif
 
                [Test]
                public void CompiledQuote ()

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_SubtractChecked.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_SubtractChecked.cs
index cbb41f4edf6c45fdda6f91b548a5cb70b89438f1..6703b7f3cd418a34d89fc1562cdeb7644db352b4 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_SubtractChecked.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_SubtractChecked.cs
@@ -184,15 +184,6 @@ namespace MonoTests.System.Linq.Expressions
                        MustOverflow<uint>  (0, 1);
                }
 
-#if !NET_4_0 // fixed in net_4_0
-               [Test]
-               public void TestBugCompatibility ()
-               {
-                       // This one does not overflow on .NET (!!!)
-                       // Sounds very odd, should file a bug with MS.
-                       MustNotOverflow<short> (Int16.MinValue, 1);
-               }
-#endif
 
                //
                // These should not overflow

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_TypeIs.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_TypeIs.cs
index 91fd32e6596816c15c17153285991e5499fe2cb4..82d797daa70bae324b79b7ed837d1af1c595ea49 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_TypeIs.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_TypeIs.cs
@@ -104,15 +104,6 @@ namespace MonoTests.System.Linq.Expressions
                        Assert.IsTrue (baz_is_bar (new Baz ()));
                }
 
-#if !NET_4_0 // dlr bug 5868
-               [Test]
-               [Category ("NotDotNet")]
-               [ExpectedException (typeof (ArgumentException))]
-               public void TypeIsVoid ()
-               {
-                       Expression.TypeIs ("yoyo".ToConstant (), typeof (void));
-               }
-#endif
 
                public static void TacTac ()
                {

diff --git a/mcs/class/System.Core/Test/System.Linq/EnumerableFixture.cs b/mcs/class/System.Core/Test/System.Linq/EnumerableFixture.cs
index 1045c8521b986d35d351ff9f383b2f5763660d7d..a9389f9b49710d088c2f7baf64b566d424566a2c 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq/EnumerableFixture.cs
+++ b/mcs/class/System.Core/Test/System.Linq/EnumerableFixture.cs
@@ -2124,7 +2124,6 @@ namespace MonoTests.System.Linq
                        Assert.That (Enumerable.AsEnumerable<object> (null), Is.Null);
                }
                
-#if NET_4_0
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
                public void Zip_FirstSourceNull_ThrowsArgumentNullException ()
@@ -2157,7 +2156,6 @@ namespace MonoTests.System.Linq
                        b = new [] { 100, 200, 300 };
                        a.Zip (b, (f, s) => f + s.ToString ()).AssertEquals ("a100");
                }
-#endif
 
 
                private Reader<T> Read<T> (params T [] source)

diff --git a/mcs/class/System.Core/Test/System.Linq/ParallelEnumerableTests.cs b/mcs/class/System.Core/Test/System.Linq/ParallelEnumerableTests.cs
index d9fac1818d3704bc36d573df94e71dbab5d698f5..5d76629eda83b52704264ca8617f71c9ada66819 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq/ParallelEnumerableTests.cs
+++ b/mcs/class/System.Core/Test/System.Linq/ParallelEnumerableTests.cs
@@ -24,7 +24,6 @@
 //
 //
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -920,4 +919,3 @@ namespace MonoTests.System.Linq
        }
 }
 
-#endif

diff --git a/mcs/class/System.Core/Test/System.Linq/ParallelTestHelper.cs b/mcs/class/System.Core/Test/System.Linq/ParallelTestHelper.cs
index f8a7ac1628c3c0f0585ac7dca7f69afc32451811..92ffe288f7dc6f466099fe0228b4c6de56814499 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq/ParallelTestHelper.cs
+++ b/mcs/class/System.Core/Test/System.Linq/ParallelTestHelper.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // TestHelper.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -91,4 +90,3 @@ namespace MonoTests.System.Linq
                }
        }
 }
-#endif

diff --git a/mcs/class/System.Core/Test/System.Runtime.CompilerServices/DynamicAttributeTest.cs b/mcs/class/System.Core/Test/System.Runtime.CompilerServices/DynamicAttributeTest.cs
index 070d65bdb0de088288282e96eea7666636db155b..1093fd2003fe67e97df796fde28affb325872421 100644 (file)
--- a/mcs/class/System.Core/Test/System.Runtime.CompilerServices/DynamicAttributeTest.cs
+++ b/mcs/class/System.Core/Test/System.Runtime.CompilerServices/DynamicAttributeTest.cs
@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.Runtime.CompilerServices;
@@ -62,4 +61,3 @@ namespace MonoTests.System.Runtime.CompilerServices
        }
 }
 
-#endif

diff --git a/mcs/class/System.Core/Test/System.Threading.Tasks/TaskExtensionsTests.cs b/mcs/class/System.Core/Test/System.Threading.Tasks/TaskExtensionsTests.cs
index 1d5c1e40cb4f1512bc322dfc5022c4fa2400456e..f40535f6e987fabf9a81e55bb1b305bead00a799 100644 (file)
--- a/mcs/class/System.Core/Test/System.Threading.Tasks/TaskExtensionsTests.cs
+++ b/mcs/class/System.Core/Test/System.Threading.Tasks/TaskExtensionsTests.cs
@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -56,4 +55,3 @@ namespace MonoTests.System.Threading.Tasks
                }
        }
 }
-#endif

diff --git a/mcs/class/System.Core/Test/System.Threading/ReaderWriterLockSlimTest.cs b/mcs/class/System.Core/Test/System.Threading/ReaderWriterLockSlimTest.cs
index 8e2c31745047e5cf74f3a6a1b3bb7bd33462b164..027776c6f1e7b6620863af67d6cc035e71a5e065 100644 (file)
--- a/mcs/class/System.Core/Test/System.Threading/ReaderWriterLockSlimTest.cs
+++ b/mcs/class/System.Core/Test/System.Threading/ReaderWriterLockSlimTest.cs
@@ -30,9 +30,7 @@ using System;
 using NUnit.Framework;
 using System.Threading;
 using System.Linq;
-#if NET_4_0
 using System.Threading.Tasks;
-#endif
 
 namespace MonoTests.System.Threading
 {
@@ -451,7 +449,6 @@ namespace MonoTests.System.Threading
                        Assert.IsTrue (v.TryEnterWriteLock (100));
                        v.ExitWriteLock ();
                }
-#if NET_4_0
                [Test]
                public void EnterWriteLockWhileInUpgradeAndOtherWaiting ()
                {
@@ -475,7 +472,6 @@ namespace MonoTests.System.Threading
 
             Assert.IsTrue (task1.Wait (500));
                }
-#endif
                [Test]
                public void RecursiveReadLockTest ()
                {

diff --git a/mcs/class/System.Data.Services/Test/System.Data.Services.Providers/DataServiceProviderMethodsTest.cs b/mcs/class/System.Data.Services/Test/System.Data.Services.Providers/DataServiceProviderMethodsTest.cs
index 551f85339a2a8d6836a242e437b8ad27b62cea63..33bf1f4aba10e51bd65b44cba8c06d52f1f2ecf9 100644 (file)
--- a/mcs/class/System.Data.Services/Test/System.Data.Services.Providers/DataServiceProviderMethodsTest.cs
+++ b/mcs/class/System.Data.Services/Test/System.Data.Services.Providers/DataServiceProviderMethodsTest.cs
@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.Data.Services.Providers;
@@ -164,4 +163,3 @@ namespace MonoTests.System.Data.Services.Providers
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Data.Services/Test/System.Data.Services.Providers/ResourceTypeTest.cs b/mcs/class/System.Data.Services/Test/System.Data.Services.Providers/ResourceTypeTest.cs
index 62d1e0ec2bb7aa6b1bb0664623ccaf134c0cf0b0..d38633c5bc99f2a799bbb828b80f12b6c8def37c 100644 (file)
--- a/mcs/class/System.Data.Services/Test/System.Data.Services.Providers/ResourceTypeTest.cs
+++ b/mcs/class/System.Data.Services/Test/System.Data.Services.Providers/ResourceTypeTest.cs
@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.Data.Services.Providers;
@@ -132,4 +131,3 @@ namespace MonoTests.System.Data.Services.Providers
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
index 982552769968b64b80de2b4238701ac20d10f0ce..a44a225534eee1f385f9f5b2ef5e9f5b07097656 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
@@ -1307,7 +1307,6 @@ namespace MonoTests.System.Data
                        }
                }
                
-#if NET_4_0
                [Test]
                public void ImportRowTypeChangeTest ()
                {
@@ -1381,7 +1380,6 @@ namespace MonoTests.System.Data
                                }
                        }
                }
-#endif
                        
                [Test]
                public void ClearReset () //To test Clear and Reset methods

diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/DataContractResolverTest.cs b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/DataContractResolverTest.cs
index 163d088201c7d59715725588dbf2dc9dd93f4e86..5ba3d4cd4bfd790912101cf63f29229b6c60ded4 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/DataContractResolverTest.cs
+++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/DataContractResolverTest.cs
@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.Collections;
@@ -115,4 +114,3 @@ public class ResolvedClass
        public Guid Baz = Guid.Parse ("c74376f0-5517-4cb7-8a07-35026423f565");
 }
 
-#endif

diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest2.cs b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest2.cs
index 9687913986155d8efee563ec507ea14329075e61..bee52d3e4f896eb4a66a1f00b47fe8b14c7b33b4 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest2.cs
+++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest2.cs
@@ -97,7 +97,6 @@ namespace MonoTests.System.Runtime.Serialization
                        Assert.That (ret.TypeArguments [0].BaseType, Is.EqualTo ("System.Int32"), "#6");
                }
 
-#if NET_4_0            
                [Test]
                public void TestSimpleList3 ()
                {
@@ -118,7 +117,6 @@ namespace MonoTests.System.Runtime.Serialization
                        Assert.That (ret.TypeArguments.Count, Is.EqualTo (1), "#5");
                        Assert.That (ret.TypeArguments [0].BaseType, Is.EqualTo ("System.Int32"), "#6");
                }
-#endif
                
                [Test]
                public void TestListOfFoo ()

diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs
index 9857450eded085b17177d68690eac5f3a2245c29..dfec47afe0e33b33c401216448ee906143664340 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs
+++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs
@@ -111,7 +111,7 @@ namespace System.ServiceModel.Web
                        // do nothing
                }
 
-#if NET_4_0 && !MOBILE
+#if !MOBILE
                static readonly XmlWriterSettings settings = new XmlWriterSettings () { OmitXmlDeclaration = true, Indent = false };
                XmlSerializer document_serializer, feed_serializer, item_serializer;
 

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpBehaviorTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpBehaviorTest.cs
index 84c076d475b7d85541f7e0470646049c2b504617..b5b64fd295e8d355e76e75ed81d4d555a77f6ad0 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpBehaviorTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpBehaviorTest.cs
@@ -59,11 +59,9 @@ namespace MonoTests.System.ServiceModel.Description
                        Assert.AreEqual (WebMessageBodyStyle.Bare, b.DefaultBodyStyle, "#1");
                        Assert.AreEqual (WebMessageFormat.Xml, b.DefaultOutgoingRequestFormat, "#2");
                        Assert.AreEqual (WebMessageFormat.Xml, b.DefaultOutgoingResponseFormat, "#3");
-#if NET_4_0
                        Assert.IsFalse (b.AutomaticFormatSelectionEnabled, "#11");
                        Assert.IsFalse (b.FaultExceptionEnabled, "#12");
                        Assert.IsFalse (b.HelpEnabled, "#13");
-#endif
                }
 
                [Test]

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpEndpointTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpEndpointTest.cs
index 401f1a1f20d9b05ed8c26135a6ed7a12f8ec667b..a8423ad3f1109ebefe77509e272e3eaab1f462bf 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpEndpointTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpEndpointTest.cs
@@ -1,4 +1,4 @@
-#if NET_4_0 && !MOBILE
+#if !MOBILE
 using System;
 using System.IO;
 using System.Runtime.Serialization;

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs
index a87a5fd32a495e6562f49e659b9e349b64dc7d56..6ab2d8b462116c354855ce0a7735270a8d610520 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs
@@ -72,7 +72,7 @@ namespace MonoTests.System.ServiceModel.Web
                        ch.Close ();
                }
 
-#if NET_4_0 && !MOBILE
+#if !MOBILE
                [Test]
                public void CreateAtom10Response ()
                {
@@ -138,7 +138,7 @@ namespace MonoTests.System.ServiceModel.Web
                string TestJson3 (string s1, string s2);
        }
 
-#if NET_4_0 && !MOBILE
+#if !MOBILE
        public class HogeService : IHogeService
        {
                static XmlWriterSettings settings = new XmlWriterSettings () { OmitXmlDeclaration = true };

diff --git a/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs
index daa5ae121d1b65ece1c66920ec84fc3965aaca0d..c13a103d20ad7ccd09b8e50ca1cf87b70b6bcc9d 100644 (file)
--- a/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs
@@ -75,7 +75,7 @@ using System.Runtime.InteropServices;
 [assembly: InternalsVisibleTo ("System.ServiceModel.Discovery, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] // AnnouncementChannelEndpointElementCollection requires it.
 #endif
 
-#if NET_4_0 && HAS_ACTIVATION
+#if HAS_ACTIVATION
 
 [assembly: TypeForwardedTo (typeof (System.ServiceModel.ServiceHostingEnvironment))]
 [assembly: TypeForwardedTo (typeof (System.ServiceModel.Activation.ServiceHostFactory))]

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/HttpTransportBindingElementTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/HttpTransportBindingElementTest.cs
index 40401dec37e39fefcc42b7f943618e5299eb037f..69f18d3dcb4ba3d5772e8c7915a21ed8c54e4012 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/HttpTransportBindingElementTest.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/HttpTransportBindingElementTest.cs
@@ -39,10 +39,7 @@ using System.Xml;
 using NUnit.Framework;
 
 using MonoTests.Helpers;
-
-#if NET_4_0
 using System.Security.Authentication.ExtendedProtection;
-#endif
 
 namespace MonoTests.System.ServiceModel.Channels
 {
@@ -471,10 +468,8 @@ namespace MonoTests.System.ServiceModel.Channels
                        http_binding_element.TransferMode = TransferMode.Streamed;
                        http_binding_element.UnsafeConnectionNtlmAuthentication = !http_binding_element.UnsafeConnectionNtlmAuthentication;
                        http_binding_element.UseDefaultWebProxy = !http_binding_element.UseDefaultWebProxy;
-#if NET_4_0
                        http_binding_element.DecompressionEnabled = !http_binding_element.DecompressionEnabled;
                        http_binding_element.ExtendedProtectionPolicy = new ExtendedProtectionPolicy (PolicyEnforcement.WhenSupported);
-#endif
 
                        // 
                        // Actual call to ExportPolicy

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/MsmqBindingElementBaseTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/MsmqBindingElementBaseTest.cs
index 902035885e92c473c386c838d4bcac136d858c6c..ef358b43ff10e1296736eba429c6c62fa143ff44 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/MsmqBindingElementBaseTest.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/MsmqBindingElementBaseTest.cs
@@ -107,11 +107,9 @@ namespace MonoTests.System.ServiceModel.Channels
                        binding_element.TimeToLive = TimeSpan.FromSeconds (60);
                        binding_element.UseMsmqTracing = !binding_element.UseMsmqTracing;
                        binding_element.UseSourceJournal = !binding_element.UseSourceJournal;
-#if NET_4_0
                        // This ones haven't been implemented yet, so comment them for now.
                        //binding_element.ReceiveContextEnabled = !binding_element.ReceiveContextEnabled;
                        //binding_element.ValidityDuration = TimeSpan.FromSeconds (30);
-#endif
 
                        binding_element.MsmqTransportSecurity.MsmqAuthenticationMode = MsmqAuthenticationMode.Certificate;
                        binding_element.MsmqTransportSecurity.MsmqEncryptionAlgorithm = MsmqEncryptionAlgorithm.Aes;

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Configuration/StandardEndpointsSectionTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Configuration/StandardEndpointsSectionTest.cs
index b294efc44e009f13f88a607abf4027daa4f44baa..8665fc7990860e744c91cbfa1cb241e1813240f4 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Configuration/StandardEndpointsSectionTest.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Configuration/StandardEndpointsSectionTest.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 
 using System;
 using System.Collections.Generic;
@@ -52,4 +51,3 @@ namespace MonoTests.System.ServiceModel.Configuration
                }
        }
 }
-#endif

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/ServiceMetadataEndpointTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/ServiceMetadataEndpointTest.cs
index 2b36aeac331fa82031f7403bc93e0e6c8b4ab1a7..c8cffbd9317e4bed7885af6f76859e2e2cd13111 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/ServiceMetadataEndpointTest.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/ServiceMetadataEndpointTest.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 
 using System;
 using System.Collections.Generic;
@@ -54,4 +53,3 @@ namespace MonoTests.System.ServiceModel.Description
                }
        }
 }
-#endif

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331_2Test.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331_2Test.cs
index 59328f08103764aba73e0fc2c0e86ee518916d13..4d6fca943e6f88529a257468d0776026019f33f0 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331_2Test.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331_2Test.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 //
 // Authors:
 //     David Straw
@@ -857,4 +856,3 @@ namespace WebServiceMoonlightTest.ServiceReference2 {
     }
 }
 
-#endif

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel/ChannelFactory_1Test.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel/ChannelFactory_1Test.cs
index 30e4c4036d8fc33542d8d403d8be93484af6c1dd..0a169ec364f9b637ccdf2093253623a73fb954ba 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel/ChannelFactory_1Test.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel/ChannelFactory_1Test.cs
@@ -434,14 +434,12 @@ namespace MonoTests.System.ServiceModel
                        Assert.AreEqual ("callResult", res.val, "#2");
                }
 
-#if NET_4_0
                [Test]
                public void ConstructorServiceEndpoint ()
                {
                        // It is okay to pass ServiceEndpoint that does not have Binding or EndpointAddress.
                        new ChannelFactory<IRequestChannel> (new ServiceEndpoint (ContractDescription.GetContract (typeof (IMetadataExchange)), null, null));
                }
-#endif
 
                public T CreateFooComplexMC_Channel<T> (bool isXml)
                {

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel/ClientBaseTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel/ClientBaseTest.cs
index 4fb3ce3a5d9b8f6d8dfd3986db1f9661d18a6018..3c12a4646869c95eb2857abe4afd116274b18837 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel/ClientBaseTest.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel/ClientBaseTest.cs
@@ -479,7 +479,6 @@ namespace MonoTests.System.ServiceModel
                        }
                }
 
-#if NET_4_0
                [Test]
                public void ConstructorServiceEndpoint ()
                {
@@ -504,6 +503,5 @@ namespace MonoTests.System.ServiceModel
                        {
                        }
                }
-#endif
        }
 }

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel/ServiceHostBaseTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel/ServiceHostBaseTest.cs
index 55441b8d24e9de01ce050e83ccf69e0dd05e4e29..c7fa92a2f93fb04244fa6b262de0a71fd9749235 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel/ServiceHostBaseTest.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel/ServiceHostBaseTest.cs
@@ -373,7 +373,6 @@ namespace MonoTests.System.ServiceModel
                        return host;
                }
 
-#if NET_4_0
                [Test]
                public void AddServiceEndpoint_Directly ()
                {
@@ -422,7 +421,6 @@ namespace MonoTests.System.ServiceModel
                        var contract = ContractDescription.GetContract (typeof (INotImplementedService));
                        host.AddServiceEndpoint (new ServiceEndpoint (contract, binding, address));
                }
-#endif
 
                #region helpers
 

diff --git a/mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/ListViewTest.cs b/mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/ListViewTest.cs
index f651fcfb8bb04d11b90d9f54df544136bbca2ed4..57fc8386befbcb7d8fbcc3650c73314f240cfb60 100644 (file)
--- a/mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/ListViewTest.cs
+++ b/mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/ListViewTest.cs
@@ -1214,7 +1214,6 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test (Description="Bug #535701, test 1")]
                public void Bug_535701_1 ()
                {
-#if NET_4_0
                        string originalHtml_1 = @"<span id=""ListViewTest"">
         0 1 2 3 4 5 6 7 8 9 
         </span>
@@ -1223,16 +1222,6 @@ namespace MonoTests.System.Web.UI.WebControls
         10 11 12 
         </span>
         <span id=""DataPager1""><a href=""javascript:__doPostBack(&#39;DataPager1$ctl00$ctl00&#39;,&#39;&#39;)"">First</a>&nbsp;<a href=""javascript:__doPostBack(&#39;DataPager1$ctl00$ctl01&#39;,&#39;&#39;)"">Previous</a>&nbsp;<a href=""javascript:__doPostBack(&#39;DataPager1$ctl01$ctl00&#39;,&#39;&#39;)"">1</a>&nbsp;<span>2</span>&nbsp;<a class=""aspNetDisabled"">Next</a>&nbsp;<a class=""aspNetDisabled"">Last</a>&nbsp;</span>";
-#else
-                       string originalHtml_1 = @"<span id=""ListViewTest"">
-        0 1 2 3 4 5 6 7 8 9 
-        </span>
-        <span id=""DataPager1""><a disabled=""disabled"">First</a>&nbsp;<a disabled=""disabled"">Previous</a>&nbsp;<span>1</span>&nbsp;<a href=""javascript:__doPostBack('DataPager1$ctl01$ctl01','')"">2</a>&nbsp;<a href=""javascript:__doPostBack('DataPager1$ctl02$ctl00','')"">Next</a>&nbsp;<a href=""javascript:__doPostBack('DataPager1$ctl02$ctl01','')"">Last</a>&nbsp;</span>";
-                       string originalHtml_2 = @"<span id=""ListViewTest"">
-        10 11 12 
-        </span>
-        <span id=""DataPager1""><a href=""javascript:__doPostBack('DataPager1$ctl00$ctl00','')"">First</a>&nbsp;<a href=""javascript:__doPostBack('DataPager1$ctl00$ctl01','')"">Previous</a>&nbsp;<a href=""javascript:__doPostBack('DataPager1$ctl01$ctl00','')"">1</a>&nbsp;<span>2</span>&nbsp;<a disabled=""disabled"">Next</a>&nbsp;<a disabled=""disabled"">Last</a>&nbsp;</span>";
-#endif
                        WebTest t = new WebTest ("ListViewTotalRowCount_Bug535701_1.aspx");
                        string pageHtml = t.Run ();
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
@@ -1253,7 +1242,6 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test (Description="Bug #535701, test 2")]
                public void Bug_535701_2 ()
                {
-#if NET_4_0
                        string originalHtml_1 = @"<span id=""ListViewTest2"">
         12345678910
         </span>
@@ -1270,24 +1258,6 @@ namespace MonoTests.System.Web.UI.WebControls
         <br /><div>
         DataPager.TotalRowCount = 14<br />
         Actual TotalRowCount = 14</div>";
-#else
-                       string originalHtml_1 = @"<span id=""ListViewTest2"">
-        12345678910
-        </span>
-        <span id=""DataPager1""><a disabled=""disabled"">First</a>&nbsp;<a disabled=""disabled"">Previous</a>&nbsp;<span>1</span>&nbsp;<a href=""javascript:__doPostBack('DataPager1$ctl01$ctl01','')"">2</a>&nbsp;<a href=""javascript:__doPostBack('DataPager1$ctl02$ctl00','')"">Next</a>&nbsp;<a href=""javascript:__doPostBack('DataPager1$ctl02$ctl01','')"">Last</a>&nbsp;</span>
-               
-        <br /><div>
-        DataPager.TotalRowCount = 14<br />
-        Actual TotalRowCount = 14</div>";
-                       string originalHtml_2 = @"<span id=""ListViewTest2"">
-        11121314
-        </span>
-        <span id=""DataPager1""><a href=""javascript:__doPostBack('DataPager1$ctl00$ctl00','')"">First</a>&nbsp;<a href=""javascript:__doPostBack('DataPager1$ctl00$ctl01','')"">Previous</a>&nbsp;<a href=""javascript:__doPostBack('DataPager1$ctl01$ctl00','')"">1</a>&nbsp;<span>2</span>&nbsp;<a disabled=""disabled"">Next</a>&nbsp;<a disabled=""disabled"">Last</a>&nbsp;</span>
-               
-        <br /><div>
-        DataPager.TotalRowCount = 14<br />
-        Actual TotalRowCount = 14</div>";
-#endif
                        WebTest t = new WebTest ("ListViewTotalRowCount_Bug535701_2.aspx");
                        string pageHtml = t.Run ();
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
@@ -1308,11 +1278,7 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test (Description="Bug #604053")]
                public void Bug_604053 ()
                {
-#if NET_4_0
                        string originalHtml = "<span id=\"Bug604053ListView1\"><table id=\"Bug604053ListView1_itemPlaceholderContainer\" border=\"0\" style=\"\"><tr style=\"\"><th>\n\t\t\t\t\t\t\t\t\t\t\tM1</th><th>\n\t\t\t\t\t\t\t\t\t\t\tM2</th>\r\n\t</tr>\n\t\t\t\t\t<tr style=\"\">\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView1_ctl10_M1Label_0\">0</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView1_ctl10_M2Label_0\">0</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t</tr>\n\t\t\t\t\r\n\t\t\n\t\t\t\t\t<tr style=\"\">\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView1_ctl12_M1Label_1\">1</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView1_ctl12_M2Label_1\">1</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t</tr>\n\t\t\t\t\r\n\r\n\r\n</table>\r\n\n\t\t\t\t\t<table><tr><td>\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t</td>\r\n\t</tr><tr><td style=\"\">\n\t\t\t\t\t\t\t\t<span id=\"Bug604053ListView1_DataPager1\"><input type=\"submit\" name=\"Bug604053ListView1$DataPager1$ctl00$ctl00\" value=\"First\" disabled=\"disabled\" />&nbsp;<span>1</span>&nbsp;<a href=\"javascript:__doPostBack(&#39;Bug604053ListView1$DataPager1$ctl01$ctl01&#39;,&#39;&#39;)\">2</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;Bug604053ListView1$DataPager1$ctl01$ctl02&#39;,&#39;&#39;)\">3</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;Bug604053ListView1$DataPager1$ctl01$ctl03&#39;,&#39;&#39;)\">4</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;Bug604053ListView1$DataPager1$ctl01$ctl04&#39;,&#39;&#39;)\">5</a>&nbsp;<input type=\"submit\" name=\"Bug604053ListView1$DataPager1$ctl02$ctl00\" value=\"Last\" />&nbsp;</span>\n\t\t\t\t\t\t\t</td>\r\n\t</tr>\r\n\r\n</table>\r\n\n\t\t\t\t</span>\n\t\t\t<span id=\"Bug604053ListView2\"><table id=\"Bug604053ListView2_itemPlaceholderContainer\" border=\"0\" style=\"\"><tr style=\"\"><th>\n\t\t\t\t\t\t\t\t\t\t\tM1</th><th>\n\t\t\t\t\t\t\t\t\t\t\tM2</th>\r\n\t</tr>\n\t\t\t\t\t<tr style=\"\">\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView2_ctl10_M1Label_0\">0</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView2_ctl10_M2Label_0\">0</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t</tr>\n\t\t\t\t\r\n\t\t\n\t\t\t\t\t<tr style=\"\">\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView2_ctl12_M1Label_1\">1</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView2_ctl12_M2Label_1\">1</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t</tr>\n\t\t\t\t\r\n\r\n\r\n</table>\r\n\n\t\t\t\t\t<table><tr><td>\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t</td>\r\n\t</tr><tr><td style=\"\">\n\t\t\t\t\t\t\t\t<span id=\"Bug604053ListView2_DataPager1\"><input type=\"submit\" name=\"Bug604053ListView2$DataPager1$ctl00$ctl00\" value=\"First\" disabled=\"disabled\" />&nbsp;<input type=\"submit\" name=\"Bug604053ListView2$DataPager1$ctl00$ctl01\" value=\"Previous\" disabled=\"disabled\" />&nbsp;<input type=\"submit\" name=\"Bug604053ListView2$DataPager1$ctl00$ctl02\" value=\"Next\" />&nbsp;<input type=\"submit\" name=\"Bug604053ListView2$DataPager1$ctl00$ctl03\" value=\"Last\" />&nbsp;</span>\n\t\t\t\t\t\t\t</td>\r\n\t</tr>\r\n\r\n</table>\r\n\n\t\t\t\t</span>";
-#else
-                       string originalHtml = "<span id=\"Bug604053ListView1\"><table id=\"Bug604053ListView1_itemPlaceholderContainer\" border=\"0\" style=\"\"><tr style=\"\"><th>\n\t\t\t\t\t\t\t\t\t\t\tM1</th><th>\n\t\t\t\t\t\t\t\t\t\t\tM2</th>\r\n\t</tr>\n\t\t\t\t\t<tr style=\"\">\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView1_ctl10_M1Label\">0</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView1_ctl10_M2Label\">0</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t</tr>\n\t\t\t\t\r\n\t\t\n\t\t\t\t\t<tr style=\"\">\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView1_ctl12_M1Label\">1</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView1_ctl12_M2Label\">1</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t</tr>\n\t\t\t\t\r\n\r\n\r\n</table>\r\n\n\t\t\t\t\t<table><tr><td>\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t</td>\r\n\t</tr><tr><td style=\"\">\n\t\t\t\t\t\t\t\t<span id=\"Bug604053ListView1_DataPager1\"><input type=\"submit\" name=\"Bug604053ListView1$DataPager1$ctl00$ctl00\" value=\"First\" disabled=\"disabled\" />&nbsp;<span>1</span>&nbsp;<a href=\"javascript:__doPostBack('Bug604053ListView1$DataPager1$ctl01$ctl01','')\">2</a>&nbsp;<a href=\"javascript:__doPostBack('Bug604053ListView1$DataPager1$ctl01$ctl02','')\">3</a>&nbsp;<a href=\"javascript:__doPostBack('Bug604053ListView1$DataPager1$ctl01$ctl03','')\">4</a>&nbsp;<a href=\"javascript:__doPostBack('Bug604053ListView1$DataPager1$ctl01$ctl04','')\">5</a>&nbsp;<input type=\"submit\" name=\"Bug604053ListView1$DataPager1$ctl02$ctl00\" value=\"Last\" />&nbsp;</span>\n\t\t\t\t\t\t\t</td>\r\n\t</tr>\r\n\r\n</table>\r\n\n\t\t\t\t</span>\n\t\t\t<span id=\"Bug604053ListView2\"><table id=\"Bug604053ListView2_itemPlaceholderContainer\" border=\"0\" style=\"\"><tr style=\"\"><th>\n\t\t\t\t\t\t\t\t\t\t\tM1</th><th>\n\t\t\t\t\t\t\t\t\t\t\tM2</th>\r\n\t</tr>\n\t\t\t\t\t<tr style=\"\">\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView2_ctl10_M1Label\">0</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView2_ctl10_M2Label\">0</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t</tr>\n\t\t\t\t\r\n\t\t\n\t\t\t\t\t<tr style=\"\">\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView2_ctl12_M1Label\">1</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t\t<td>\n\t\t\t\t\t\t\t<span id=\"Bug604053ListView2_ctl12_M2Label\">1</span>\n\t\t\t\t\t\t</td>\n\t\t\t\t\t</tr>\n\t\t\t\t\r\n\r\n\r\n</table>\r\n\n\t\t\t\t\t<table><tr><td>\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t</td>\r\n\t</tr><tr><td style=\"\">\n\t\t\t\t\t\t\t\t<span id=\"Bug604053ListView2_DataPager1\"><input type=\"submit\" name=\"Bug604053ListView2$DataPager1$ctl00$ctl00\" value=\"First\" disabled=\"disabled\" />&nbsp;<input type=\"submit\" name=\"Bug604053ListView2$DataPager1$ctl00$ctl01\" value=\"Previous\" disabled=\"disabled\" />&nbsp;<input type=\"submit\" name=\"Bug604053ListView2$DataPager1$ctl00$ctl02\" value=\"Next\" />&nbsp;<input type=\"submit\" name=\"Bug604053ListView2$DataPager1$ctl00$ctl03\" value=\"Last\" />&nbsp;</span>\n\t\t\t\t\t\t\t</td>\r\n\t</tr>\r\n\r\n</table>\r\n\n\t\t\t\t</span>";
-#endif                 
                        WebTest t = new WebTest ("ListViewTotalRowCount_Bug604053.aspx");
                        string pageHtml = t.Run ();
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);

diff --git a/mcs/class/System.Web.Routing/Test/System.Web.Routing/FakeHttpWorkerRequest.cs b/mcs/class/System.Web.Routing/Test/System.Web.Routing/FakeHttpWorkerRequest.cs
index 5d59be0c2fbecfa592a256e34c0f45343f678b66..1e536b0dcfd35b53be6367aa042e7314656de52e 100644 (file)
--- a/mcs/class/System.Web.Routing/Test/System.Web.Routing/FakeHttpWorkerRequest.cs
+++ b/mcs/class/System.Web.Routing/Test/System.Web.Routing/FakeHttpWorkerRequest.cs
@@ -81,11 +81,7 @@ namespace MonoTests.Common
 
         public override string GetRawUrl ()
         {
-#if NET_4_0
            return "/GetRawUrl";
-#else
-            return "GetRawUrl";
-#endif
         }
 
         public override string GetHttpVerbName ()

diff --git a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RequestContext.cs b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RequestContext.cs
index 7e890be7939941feb74016c978f4024b31a67a97..5d2aeceb85542b941d91531211a3fde287cf2f1f 100644 (file)
--- a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RequestContext.cs
+++ b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RequestContext.cs
@@ -40,7 +40,6 @@ namespace MonoTests.System.Web.Routing
        [TestFixture]
        public class RequestContextTest
        {
-#if NET_4_0
                [Test]
                public void DefaultConstructor ()
                {
@@ -49,7 +48,6 @@ namespace MonoTests.System.Web.Routing
                        Assert.AreEqual (null, rc.HttpContext, "#A1");
                        Assert.AreEqual (null, rc.RouteData, "#A2");
                }
-#endif
                [Test]
                public void Constructor_HttpContextBase_RouteData ()
                {
@@ -72,14 +70,12 @@ namespace MonoTests.System.Web.Routing
                        var rc = new RequestContext (ctx, new RouteData ());
 
                        Assert.AreSame (ctx, rc.HttpContext, "#A1");
-#if NET_4_0
                        ctx = new HttpContextWrapper (new HttpContext (new HttpRequest ("filename", "http://localhost/filename", String.Empty), new HttpResponse (new StringWriter ())));
                        rc.HttpContext = ctx;
                        Assert.AreSame (ctx, rc.HttpContext, "#A2");
 
                        rc.HttpContext = null;
                        Assert.IsNull (rc.HttpContext, "#A3");
-#endif
                }
 
                [Test]
@@ -90,14 +86,12 @@ namespace MonoTests.System.Web.Routing
                        var rc = new RequestContext (ctx, rd);
 
                        Assert.AreSame (rd, rc.RouteData, "#A1");
-#if NET_4_0
                        rd = new RouteData ();
                        rc.RouteData = rd;
                        Assert.AreSame (rd, rc.RouteData, "#A2");
 
                        rc.RouteData = null;
                        Assert.IsNull (rc.RouteData, "#A3");
-#endif
                }
        }
 }

diff --git a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs
index 18b52ea11ba3e77e607c455a04e753e395eb9dc3..a6f26b6b6f6dfc151d114892ac1f0259ce7dadc0 100644 (file)
--- a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs
+++ b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs
@@ -131,17 +131,8 @@ namespace MonoTests.System.Web.Routing
                {
                        var rd = new RouteCollection () { RouteExistingFiles = true }.GetRouteData (new HttpContextStub2 (null, null, null));
                        Assert.IsNull (rd, "#A1");
-#if NET_4_0
                        rd = new RouteCollection ().GetRouteData (new HttpContextStub2 (null, null, null));
                        Assert.IsNull (rd, "#A2");
-#else
-                       try {
-                               new RouteCollection ().GetRouteData (new HttpContextStub2 (null, null, null));
-                               Assert.Fail ("#A3");
-                       } catch (NotImplementedException) {
-                               // it should fail due to the NIE on AppRelativeCurrentExecutionFilePath.
-                       }
-#endif
                }
 
                [Test]
@@ -648,7 +639,6 @@ namespace MonoTests.System.Web.Routing
                        
                        Assert.IsNotNull (rd, "#A1");
                }
-#if NET_4_0
                [Test]
                public void Ignore_String ()
                {
@@ -926,6 +916,5 @@ namespace MonoTests.System.Web.Routing
                        Assert.AreEqual (typeof (PageRouteHandler), rd.RouteHandler.GetType (), "#A4-3");
                        Assert.IsFalse (((PageRouteHandler) rd.RouteHandler).CheckPhysicalUrlAccess, "#A4-4");
                }
-#endif
        }
 }

diff --git a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs
index b9e9be7247ca21e35e58e3ce6485b245f5ed0b70..c9fd18a29cf437d1402bfa1d1f8c447c995c3d24 100644 (file)
--- a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs
+++ b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs
@@ -627,7 +627,6 @@ namespace MonoTests.System.Web.Routing
                        var hc = new HttpContextStub ("~/xyzxyzxyzxyzblah", String.Empty);
                        var rd = r.GetRouteData (hc);
 
-#if NET_4_0 || !DOTNET
                        // When running on Mono this test succeeds - it was a bug in .NET routing for 3.5 which
                        // we don't reproduce anymore.
                        Assert.IsNotNull (rd, "#1");
@@ -637,9 +636,6 @@ namespace MonoTests.System.Web.Routing
                        Assert.AreEqual ("xyz", rd.Values ["foo"], "#4-1");
                        Assert.AreEqual ("xyz", rd.Values ["bar"], "#4-2");
                        Assert.AreEqual ("blah", rd.Values ["baz"], "#4-3");
-#else
-                       Assert.IsNull (rd, "#1");
-#endif
                }
 
                [Test]
@@ -738,7 +734,6 @@ namespace MonoTests.System.Web.Routing
                        var hc = new HttpContextStub ("~/xyzxyzxyzxyzxyzxyzblah", String.Empty);
                        var rd = r.GetRouteData (hc);
 
-#if NET_4_0 || !DOTNET
                        // When running on Mono this test succeeds - it was a bug in .NET routing for 3.5 which
                        // we don't reproduce anymore.
                        Assert.IsNotNull (rd, "#1");
@@ -748,9 +743,6 @@ namespace MonoTests.System.Web.Routing
                        Assert.AreEqual ("xyzxyzxyz", rd.Values ["foo"], "#4-1");
                        Assert.AreEqual ("xyz", rd.Values ["bar"], "#4-2");
                        Assert.AreEqual ("blah", rd.Values ["baz"], "#4-3");
-#else
-                       Assert.IsNull (rd, "#1");
-#endif
                }
 
                [Test]
@@ -776,7 +768,6 @@ namespace MonoTests.System.Web.Routing
                        var hc = new HttpContextStub ("~/xyzxyzxyzdabxyzblah", String.Empty);
                        var rd = r.GetRouteData (hc);
 
-#if NET_4_0 || !DOTNET
                        // When running on Mono this test succeeds - it was a bug in .NET routing for 3.5 which
                        // we don't reproduce anymore.
                        Assert.IsNotNull (rd, "#1");
@@ -786,9 +777,6 @@ namespace MonoTests.System.Web.Routing
                        Assert.AreEqual ("xyz", rd.Values ["foo"], "#4-1");
                        Assert.AreEqual ("dab", rd.Values ["bar"], "#4-2");
                        Assert.AreEqual ("blah", rd.Values ["baz"], "#4-3");
-#else
-                       Assert.IsNull (rd, "#1");
-#endif
                }
 
                [Test]
@@ -798,7 +786,6 @@ namespace MonoTests.System.Web.Routing
                        var hc = new HttpContextStub ("~/xyzxyzxyzxyzxyz", String.Empty);
                        var rd = r.GetRouteData (hc);
 
-#if NET_4_0 || !DOTNET
                        // When running on Mono this test succeeds - it was a bug in .NET routing for 3.5 which
                        // we don't reproduce anymore.
                        Assert.IsNotNull (rd, "#1");
@@ -808,9 +795,6 @@ namespace MonoTests.System.Web.Routing
                        Assert.AreEqual ("xyz", rd.Values ["foo"], "#4-1");
                        Assert.AreEqual ("xyz", rd.Values ["bar"], "#4-2");
                        Assert.AreEqual ("xyz", rd.Values ["baz"], "#4-3");
-#else
-                       Assert.IsNull (rd, "#1");
-#endif
                }
 
                [Test]
@@ -1375,7 +1359,6 @@ namespace MonoTests.System.Web.Routing
 
                }
                
-#if NET_4_0
                [Test (Description="Bug #671753")]
                public void GetVirtualPath15 ()
                {
@@ -1396,7 +1379,6 @@ namespace MonoTests.System.Web.Routing
                        Assert.IsNotNull (RouteTable.Routes.GetVirtualPath (rc, "TestRoute", new RouteValueDictionary ()), "#A3");
                        Assert.IsNotNull (RouteTable.Routes.GetVirtualPath (rc, "TestRoute", null), "#A4");
                }
-#endif
 
                [Test (Description="Xamarin Bug #9116")]
                public void GetVirtualPath16 ()

diff --git a/mcs/class/System.Web.Routing/Test/System.Web.Routing/TestStubTypes.cs b/mcs/class/System.Web.Routing/Test/System.Web.Routing/TestStubTypes.cs
index 817ae81973e892c81add39b6b86cdbd11adbb3db..45f3ede61226f3453726c79f5fc3a80545fc7f46 100644 (file)
--- a/mcs/class/System.Web.Routing/Test/System.Web.Routing/TestStubTypes.cs
+++ b/mcs/class/System.Web.Routing/Test/System.Web.Routing/TestStubTypes.cs
@@ -248,7 +248,6 @@ namespace MonoTests.System.Web.Routing
 
                public string RewrittenPath { get; set; }
        }
-#if NET_4_0
        class FakeHttpRequestWrapper : HttpRequestWrapper
        {
                string requestUrl;
@@ -320,7 +319,6 @@ namespace MonoTests.System.Web.Routing
                        wrapper = new FakeHttpRequestWrapper (requestUrl, path, appPath);
                }
        }
-#endif
        public class MyStopRoutingHandler : StopRoutingHandler
        {
                public IHttpHandler CallGetHttpHandler (RequestContext rc)

diff --git a/mcs/class/System.Web.Routing/Test/System.Web.Routing/UrlRoutingModuleTest.cs b/mcs/class/System.Web.Routing/Test/System.Web.Routing/UrlRoutingModuleTest.cs
index a55d911e567866ee396ccf8ead3eb1e45af48a7b..784dc510895dae089275d6a91a2b298a44f6ba9c 100644 (file)
--- a/mcs/class/System.Web.Routing/Test/System.Web.Routing/UrlRoutingModuleTest.cs
+++ b/mcs/class/System.Web.Routing/Test/System.Web.Routing/UrlRoutingModuleTest.cs
@@ -85,17 +85,6 @@ namespace MonoTests.System.Web.Routing
                        m.PostResolveRequestCache (new HttpContextStub2 ("~/foo/bar", null));
                }
 
-#if !NET_4_0
-               [Test]
-               [ExpectedException (typeof (InvalidOperationException))]
-               public void PostResolveRequestCacheNullHttpHandler ()
-               {
-                       var m = new UrlRoutingModule ();
-                       RouteTable.Routes.Add (new MyRoute ("foo/bar", new NullRouteHandler ()));
-
-                       m.PostResolveRequestCache (new HttpContextStub2 ("~/foo/bar", null));
-               }
-#endif
                [Test]
                [ExpectedException (typeof (NotImplementedException))]
                public void PostResolveRequestCacheNoPath ()
@@ -106,53 +95,15 @@ namespace MonoTests.System.Web.Routing
                        m.PostResolveRequestCache (new HttpContextStub2 ("~/foo/bar", null));
                }
 
-#if !NET_4_0
-               [Test]
-               public void PostResolveRequestCacheCallRewritePath ()
-               {
-                       var m = new UrlRoutingModule ();
-                       RouteTable.Routes.Add (new MyRoute ("{foo}/{bar}", new MyRouteHandler ()));
-                       var hc = new HttpContextStub2 ("~/x/y", "z");
-                       try {
-                               m.PostResolveRequestCache (hc);
-                               Assert.Fail ("#1");
-                       } catch (ApplicationException ex) {
-                               Assert.AreEqual ("~/UrlRouting.axd", ex.Message, "#2");
-                       }
-               }
-
-               [Test]
-               public void PostResolveRequestCacheModifiedPath ()
-               {
-                       var m = new UrlRoutingModule ();
-                       RouteTable.Routes.Add (new MyRoute ("{foo}/{bar}", new MyRouteHandler ()));
-                       var hc = new HttpContextStub2 ("~/x/y", "z", "apppath");
-                       hc.SetResponse (new HttpResponseStub (2));
-                       try {
-                               m.PostResolveRequestCache (hc);
-                               Assert.Fail ("#1");
-                       } catch (ApplicationException ex) {
-                               Assert.AreEqual ("~/UrlRouting.axd", ex.Message, "#2");
-                       }
-               }
-#endif
                [Test]
                public void PostResolveRequestCache ()
                {
                        var m = new UrlRoutingModule ();
                        RouteTable.Routes.Add (new MyRoute ("{foo}/{bar}", new MyRouteHandler ()));
-#if NET_4_0
                        var hc = new HttpContextStub4 ("~/x/y", "z", "apppath", false);
-#else
-                       var hc = new HttpContextStub3 ("~/x/y", "z", "apppath", false);
-#endif
                        hc.SetResponse (new HttpResponseStub (2));
                        m.PostResolveRequestCache (hc);
-#if NET_4_0
                        Assert.AreEqual (null, hc.RewrittenPath, "#1");
-#else
-                       Assert.AreEqual ("~/UrlRouting.axd", hc.RewrittenPath, "#1");
-#endif
                        // it internally stores the handler 
                }
                
@@ -203,49 +154,23 @@ namespace MonoTests.System.Web.Routing
                {
                        var m = new UrlRoutingModule ();
                        RouteTable.Routes.Add (new MyRoute ("{foo}/{bar}", new MyRouteHandler ()));
-#if NET_4_0
                        var hc = new HttpContextStub4 ("~/x/y", "z", "apppath", true);
-#else
-                       var hc = new HttpContextStub3 ("~/x/y", "z", "apppath", true);
-#endif
                        hc.HttpHandler = new MyHttpHandler ();
                        hc.SetResponse (new HttpResponseStub (2));
                        m.PostResolveRequestCache (hc);
-#if NET_4_0
                        Assert.AreEqual (null, hc.RewrittenPath, "#1");
-#else
-                       Assert.AreEqual ("~/UrlRouting.axd", hc.RewrittenPath, "#1");
-#endif
                        // It tries to set Handler and causes NIE
                        m.PostMapRequestHandler (hc);
                }
 
                [Test]
-#if !NET_4_0
-               [ExpectedException (typeof (ApplicationException))]
-#endif
                public void Pipeline3 ()
                {
                        var m = new UrlRoutingModule ();
                        RouteTable.Routes.Add (new MyRoute ("{foo}/{bar}", new MyRouteHandler ()));
-#if NET_4_0
                        var hc = new HttpContextStub5 ("~/x/y", String.Empty, "apppath");
-#else
-                       var hc = new HttpContextStub2 ("~/x/y", String.Empty, "apppath");
-#endif
                        hc.SetResponse (new HttpResponseStub (2));
-#if NET_4_0
                        Assert.IsNull (m.RouteCollection.GetRouteData (hc), "#0");
-#else
-                       Assert.IsNotNull (m.RouteCollection.GetRouteData (hc), "#0");
-                       m.PostResolveRequestCache (hc);
-                       try {
-                               m.PostMapRequestHandler (hc);
-                               Assert.Fail ("#1");
-                       } catch (ApplicationException ex) {
-                               Assert.AreEqual ("~/UrlRouting.axd", ex.Message, "#2");
-                       }
-#endif
                }
        }
 }

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs
index 865c463688d36b2aebcceaf22ded597e2ec1ce44..0bde072c28a014541503b8957ddcbbd8ae1946a7 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs
@@ -248,11 +248,6 @@ namespace System.Web.UI.WebControls {
                                writer.Write (s);
                                writer.RenderEndTag ();
                        }
-// #if !NET_4_0
-//                     else if (HasControls ()) {
-//                             writer.Indent++;
-//                     }
-// #endif
                }
 
                void IPostBackEventHandler.RaisePostBackEvent (string argument)

diff --git a/mcs/class/System.Web/System.Web.Util/HttpEncoder.cs b/mcs/class/System.Web/System.Web.Util/HttpEncoder.cs
index 26291567138f05c41345e27818c65e44ab9acd3e..abf6238524544173140691a58a874377c05c27ee 100644 (file)
--- a/mcs/class/System.Web/System.Web.Util/HttpEncoder.cs
+++ b/mcs/class/System.Web/System.Web.Util/HttpEncoder.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
 using System.Text;
-#if !NO_SYSTEM_WEB_DEPENDENCY && NET_4_0 && !MOBILE
+#if !NO_SYSTEM_WEB_DEPENDENCY && !MOBILE
 using System.Web.Configuration;
 #endif
 

diff --git a/mcs/class/System.Web/System.Web_test.dll.sources b/mcs/class/System.Web/System.Web_test.dll.sources
index 29339b428c9d3f6677cac539ae7e76751a53878d..4416f5a698b9262d036092092c23f1b41e3585a4 100644 (file)
--- a/mcs/class/System.Web/System.Web_test.dll.sources
+++ b/mcs/class/System.Web/System.Web_test.dll.sources
@@ -272,7 +272,6 @@ System.Web.UI.WebControls/RangeValidatorTest.cs
 System.Web.UI.WebControls/RectangleHotSpotTest.cs
 System.Web.UI.WebControls/RegularExpressionValidatorTest.cs
 System.Web.UI.WebControls/RepeatInfoTest.auto.cs
-System.Web.UI.WebControls/RepeatInfoTest.auto.2.0.cs
 System.Web.UI.WebControls/RepeatInfoTest.auto.4.0.cs
 System.Web.UI.WebControls/RepeatInfoTest.cs
 System.Web.UI.WebControls/RepeatInfoUser.cs

diff --git a/mcs/class/System.Web/Test/System.Web.Caching/FileResponseElementTest.cs b/mcs/class/System.Web/Test/System.Web.Caching/FileResponseElementTest.cs
index ee2bd41226523258e853938f525d69913cc810f0..ac14cee58ba3ac542d913bce06beac1bb15337db 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Caching/FileResponseElementTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Caching/FileResponseElementTest.cs
@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 using System;
 using System.Web;
 using System.Web.Caching;
@@ -70,4 +69,3 @@ namespace MonoTests.System.Web.Caching
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/System.Web.Caching/HeaderElementTest.cs b/mcs/class/System.Web/Test/System.Web.Caching/HeaderElementTest.cs
index e9e505926997e33df4648e9c0533dd63f1a1b321..7a6a7434b8a1b5593f3c8b85d9b5a273217299d9 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Caching/HeaderElementTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Caching/HeaderElementTest.cs
@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 using System;
 using System.Web;
 using System.Web.Caching;
@@ -68,4 +67,3 @@ namespace MonoTests.System.Web.Caching
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/System.Web.Caching/MemoryResponseElementTest.cs b/mcs/class/System.Web/Test/System.Web.Caching/MemoryResponseElementTest.cs
index 6f732dddcb82db8adb0245a7fc22f3763cbb7085..bfee3cc479b4b44c68407f10c807b4534074a9a1 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Caching/MemoryResponseElementTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Caching/MemoryResponseElementTest.cs
@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 using System;
 using System.Web;
 using System.Web.Caching;
@@ -74,4 +73,3 @@ namespace MonoTests.System.Web.Caching
                }
        }
 }
-#endif

diff --git a/mcs/class/System.Web/Test/System.Web.Caching/SqlCacheDependencyTest.cs b/mcs/class/System.Web/Test/System.Web.Caching/SqlCacheDependencyTest.cs
index 264074366b8dd929661618639dd40731321e6cdd..e26dafb8ce975c392f8d9437eb964eb840411b8f 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Caching/SqlCacheDependencyTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Caching/SqlCacheDependencyTest.cs
@@ -65,7 +65,6 @@ namespace MonoTests.System.Web.Caching
                        //}, "#A3");
                }
 
-#if NET_4_0
                [Test]
                public void CreateOutputCacheDependency ()
                {
@@ -90,7 +89,6 @@ namespace MonoTests.System.Web.Caching
                        //sqc = SqlCacheDependency.CreateOutputCacheDependency ("Database:table; AnotherDatabase:table");
                        //Assert.IsTrue (sql is AggregateCacheDependency, "#B2");
                }
-#endif
        }
 }
 

diff --git a/mcs/class/System.Web/Test/System.Web.Caching/SubstitutionResponseElementTest.cs b/mcs/class/System.Web/Test/System.Web.Caching/SubstitutionResponseElementTest.cs
index e277b12f0c0ab7be74700858ad53a0c6e798287c..64a32af27baeb4df1e314f6dcd490b1e4d75ed67 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Caching/SubstitutionResponseElementTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Caching/SubstitutionResponseElementTest.cs
@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 using System;
 using System.Web;
 using System.Web.Caching;
@@ -61,4 +60,3 @@ namespace MonoTests.System.Web.Caching
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/System.Web.Compilation/BuildManagerTest.cs b/mcs/class/System.Web/Test/System.Web.Compilation/BuildManagerTest.cs
index 7a748e634d82b64ab97d3d669fd354592ff8e0aa..28de9a7623fdeb6de7ead34bf7798454dd843885 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Compilation/BuildManagerTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Compilation/BuildManagerTest.cs
@@ -41,7 +41,6 @@ namespace MonoTests.System.Web.Compilation
        [Serializable]
        public class BuildManagerTest
        {
-#if NET_4_0
                [Test]
                [Ignore ("Pending investigation if it is indeed the correct test.")]
                public void GetGlobalAsaxType ()
@@ -59,6 +58,5 @@ namespace MonoTests.System.Web.Compilation
                        Assert.AreEqual ("", BuildManager.TargetFramework.Profile, "#A1-3");
                        Assert.AreEqual (new Version (4, 0), BuildManager.TargetFramework.Version, "#A1-4");
                }
-#endif
        }
 }

diff --git a/mcs/class/System.Web/Test/System.Web.Compilation/BuildProviderTest.cs b/mcs/class/System.Web/Test/System.Web.Compilation/BuildProviderTest.cs
index fa8d77031c2c541060c15ed4e079e324353db9dd..852b3773c953ce109564956bf884a2e9fa7a4b69 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Compilation/BuildProviderTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Compilation/BuildProviderTest.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.CodeDom;
 using System.IO;
@@ -78,4 +77,3 @@ namespace MonoTests.System.Web.Compilation
        {
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/System.Web.Compilation/RouteUrlExpressionBuilderTest.cs b/mcs/class/System.Web/Test/System.Web.Compilation/RouteUrlExpressionBuilderTest.cs
index a549dd5825fc99ac0574b5484028dc6558422192..68a97a2e7e4181f0fb3db927e47a6dc58f51f31c 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Compilation/RouteUrlExpressionBuilderTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Compilation/RouteUrlExpressionBuilderTest.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.CodeDom;
 using System.IO;
@@ -286,4 +285,3 @@ namespace MonoTests.System.Web.Compilation
                }
        }
 }
-#endif

diff --git a/mcs/class/System.Web/Test/System.Web.Configuration/MachineKeySectionTest.cs b/mcs/class/System.Web/Test/System.Web.Configuration/MachineKeySectionTest.cs
index 7b1b941daee52c5d31f721beeb95f27822bb2a2d..dd324ad03886e516d91a1f36e2b7ec82788b1112 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Configuration/MachineKeySectionTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Configuration/MachineKeySectionTest.cs
@@ -40,26 +40,16 @@ namespace MonoTests.System.Web.Configuration {
                public void DefaultValues ()
                {
                        MachineKeySection section = new MachineKeySection ();
-#if NET_4_0
                        Assert.AreEqual (MachineKeyCompatibilityMode.Framework20SP1, section.CompatibilityMode, "CompatibilityMode");
-#endif
                        Assert.AreEqual ("Auto", section.Decryption, "Decryption");
                        Assert.AreEqual ("AutoGenerate,IsolateApps", section.DecryptionKey, "DecryptionKey");
-#if NET_4_0
                        Assert.AreEqual (MachineKeyValidation.HMACSHA256, section.Validation, "Validation");
                        Assert.AreEqual ("HMACSHA256", section.ValidationAlgorithm, "ValidationAlgorithm");
-#else
-                       Assert.AreEqual (MachineKeyValidation.SHA1, section.Validation, "Validation");
-#endif
                        Assert.AreEqual ("AutoGenerate,IsolateApps", section.ValidationKey, "ValidationKey");
                }
 
                [Test]
-#if NET_4_0
                [ExpectedException (typeof (NullReferenceException))]
-#else
-               [ExpectedException (typeof (ConfigurationErrorsException))]
-#endif
                public void Decryption_Null ()
                {
                        MachineKeySection section = new MachineKeySection ();
@@ -73,7 +63,6 @@ namespace MonoTests.System.Web.Configuration {
                        MachineKeySection section = new MachineKeySection ();
                        section.Decryption = String.Empty;
                }
-#if NET_4_0
                [Test]
                public void Decryption_RC2 ()
                {
@@ -172,7 +161,6 @@ namespace MonoTests.System.Web.Configuration {
                        Assert.AreEqual (MachineKeyValidation.Custom, section.Validation, "after");
                        Assert.AreEqual ("alg:UnexistingType", section.ValidationAlgorithm, "ValidationAlgorithm");
                }
-#endif
        }
 }
 

diff --git a/mcs/class/System.Web/Test/System.Web.Configuration/MachineKeyValidationConverterTest.cs b/mcs/class/System.Web/Test/System.Web.Configuration/MachineKeyValidationConverterTest.cs
index f99158367cc21b9f01ca798837c371444533f6b7..a9a605c61c7612293b16056dac59a4646fc2882a 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Configuration/MachineKeyValidationConverterTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Configuration/MachineKeyValidationConverterTest.cs
@@ -77,7 +77,6 @@ namespace MonoTests.System.Web.Configuration {
 
                        o = cv.ConvertFrom (null, null, "AES");
                        Assert.AreEqual ("AES", o.ToString (), "AES");
-#if NET_4_0
                        o = cv.ConvertFrom (null, null, "HMACSHA256");
                        Assert.AreEqual ("HMACSHA256", o.ToString (), "HMACSHA256");
 
@@ -86,10 +85,8 @@ namespace MonoTests.System.Web.Configuration {
 
                        o = cv.ConvertFrom (null, null, "HMACSHA512");
                        Assert.AreEqual ("HMACSHA512", o.ToString (), "HMACSHA512");
-#endif
                }
 
-#if NET_4_0
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void ConvertFrom_Custom ()
@@ -97,7 +94,6 @@ namespace MonoTests.System.Web.Configuration {
                        MachineKeyValidationConverter cv = new MachineKeyValidationConverter ();
                        cv.ConvertFrom (null, null, "Custom");
                }
-#endif
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
@@ -126,14 +122,11 @@ namespace MonoTests.System.Web.Configuration {
                        Assert.AreEqual ("MD5", cv.ConvertTo (null, null, MachineKeyValidation.MD5, typeof (string)), "A1");
                        Assert.AreEqual ("SHA1", cv.ConvertTo (null, null, MachineKeyValidation.SHA1, typeof (string)), "A2");
                        Assert.AreEqual ("3DES", cv.ConvertTo (null, null, MachineKeyValidation.TripleDES, typeof (string)), "A3");
-#if NET_4_0
                        Assert.AreEqual ("HMACSHA256", cv.ConvertTo (null, null, MachineKeyValidation.HMACSHA256, typeof (string)), "HMACSHA256");
                        Assert.AreEqual ("HMACSHA384", cv.ConvertTo (null, null, MachineKeyValidation.HMACSHA384, typeof (string)), "HMACSHA384");
                        Assert.AreEqual ("HMACSHA512", cv.ConvertTo (null, null, MachineKeyValidation.HMACSHA512, typeof (string)), "HMACSHA512");
-#endif
                }
 
-#if NET_4_0
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void ConvertTo_Custom ()
@@ -141,14 +134,9 @@ namespace MonoTests.System.Web.Configuration {
                        MachineKeyValidationConverter cv = new MachineKeyValidationConverter ();
                        cv.ConvertTo (null, null, MachineKeyValidation.Custom, typeof (string));
                }
-#endif
 
                [Test]
-#if NET_4_0
                [ExpectedException (typeof (ArgumentException))]
-#else
-               [ExpectedException (typeof (NullReferenceException))]
-#endif
                public void ConvertTo_NullError ()
                {
                        MachineKeyValidationConverter cv = new MachineKeyValidationConverter ();
@@ -157,11 +145,7 @@ namespace MonoTests.System.Web.Configuration {
                }
 
                [Test]
-#if NET_4_0
                [ExpectedException (typeof (ArgumentException))]
-#else
-               [ExpectedException (typeof (FormatException))]
-#endif
                public void ConvertTo_TypeError1 ()
                {
                        MachineKeyValidationConverter cv = new MachineKeyValidationConverter ();
@@ -179,11 +163,7 @@ namespace MonoTests.System.Web.Configuration {
                }
 
                [Test]
-#if NET_4_0
                [ExpectedException (typeof (ArgumentException))]
-#else
-               [ExpectedException (typeof (FormatException))]
-#endif
                public void ConvertTo_TypeError3 ()
                {
                        MachineKeyValidationConverter cv = new MachineKeyValidationConverter ();

diff --git a/mcs/class/System.Web/Test/System.Web.Security/MachineKeyTest.cs b/mcs/class/System.Web/Test/System.Web.Security/MachineKeyTest.cs
index d00e0eb60d793a84fcfb84cfc4039a622c338c06..06ee42a1a11954ad135e2bceda783c3e00a6beec 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Security/MachineKeyTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Security/MachineKeyTest.cs
@@ -28,7 +28,6 @@
 using System.Security.Cryptography;
 
 
-#if NET_4_0
 using System;
 using System.Text;
 using System.Web.Security;
@@ -204,4 +203,3 @@ namespace MonoTests.System.Web.Security
 #endif
        }
 }
-#endif

diff --git a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlFormTest.cs b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlFormTest.cs
index 58b7881c24a2a85213fd7e2947b0ec2562cb5f8e..b08edd3da7e09bfbe131443a800418f868865683 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlFormTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlFormTest.cs
@@ -200,11 +200,9 @@ namespace MonoTests.System.Web.UI.HtmlControls {
 
                        // Indirect test for HttpRequest.QueryStringRaw, see
                        // https://bugzilla.novell.com/show_bug.cgi?id=376352
-#if NET_4_0
                        Assert.AreEqual (" method=\"post\" action=\"?q=1&q2=2\"", attrs, "A1");
                        form.RenderingCompatibility = new Version (3, 5);
                        attrs = form.RenderAttributes ();
-#endif
                        Assert.AreEqual (" name=\"aspnetForm\" method=\"post\" action=\"?q=1&q2=2\"", attrs, "A2");
                }
 #endif
@@ -218,11 +216,9 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                        form.Page = p;
                        form.Action = "someactionfile.aspx";
                        string attrs = form.RenderAttributes ();
-#if NET_4_0
                        Assert.AreEqual (" method=\"post\" action=\"someactionfile.aspx\"", attrs, "A1");
                        form.RenderingCompatibility = new Version (3, 5);
                        attrs = form.RenderAttributes ();
-#endif
                        Assert.AreEqual (" name=\"aspnetForm\" method=\"post\" action=\"someactionfile.aspx\"", attrs, "A2");
                }
                

diff --git a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputButtonTest.cs b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputButtonTest.cs
index a9e39053d6671e68ba1ecee5d7f3364614f4ae87..5ae77e49dd21386bf58d26a430d58ee6e0bf8858 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputButtonTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputButtonTest.cs
@@ -157,13 +157,8 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                [Test]
                public void OnClickAttributeWithSpecials ()
                {
-#if NET_4_0
                        string origHtml = "alert('<&');";
                        string origHtml2 = "alert('<&');";
-#else
-                       string origHtml = "alert('&lt;&amp;');";
-                       string origHtml2 = "alert('<&');";
-#endif
 
                        StringWriter sw = new StringWriter ();
                        HtmlTextWriter tw = new HtmlTextWriter (sw);

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls.Adapters/MenuAdapterTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls.Adapters/MenuAdapterTest.cs
index 804313f84ae6ea22bd551117fe402fc3d3f24c0d..fe1cb73ac5de134f1f044f60185385730ed81074 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls.Adapters/MenuAdapterTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls.Adapters/MenuAdapterTest.cs
@@ -57,9 +57,7 @@ namespace MonoTests.System.Web.UI.WebControls.Adapters
                {
                        p = new Page ();
                        c = new MyMenu ();
-#if NET_4_0
                        c.RenderingMode = MenuRenderingMode.Table;
-#endif
                        a = new MyMenuAdapter (c);
                        p.Controls.Add(c);
                        sw = new StringWriter ();

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseDataBoundControlTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseDataBoundControlTest.cs
index b312107569c11633ff747d9376c92623dacc9e66..dc358f382b99e2c3c31b7f70474f23eb463e23d2 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseDataBoundControlTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseDataBoundControlTest.cs
@@ -180,7 +180,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        p.DataSource = new Object();
                        Assert.AreEqual (true, p.ValidateDataSourceCalled);
                }
-#if NET_4_0
                [Test]
                public void SupportsDisabledAttribute ()
                {
@@ -194,6 +193,5 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.AreEqual (ver35, p.RenderingCompatibility, "#A2-1");
                        Assert.IsTrue (p.SupportsDisabledAttribute, "#A2-2");
                }
-#endif
        }
 }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseDataListTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseDataListTest.cs
index 82355fa4550e708cd10d3788d1963d7dcf94bd30..8202d2c4ea1fa93d8e4eb0f6a0e6cee321491cda 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseDataListTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseDataListTest.cs
@@ -802,7 +802,6 @@ namespace MonoTests.System.Web.UI.WebControls {
                        // and junk
                        Assert.IsFalse (BaseDataList.IsBindableType (this.GetType ()), "this");
                }
-#if NET_4_0
                [Test]
                public void SupportsDisabledAttribute ()
                {
@@ -816,6 +815,5 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Assert.AreEqual (ver35, p.RenderingCompatibility, "#A2-1");
                        Assert.IsTrue (p.SupportsDisabledAttribute, "#A2-2");
                }
-#endif
        }
 }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/BoundFieldTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/BoundFieldTest.cs
index df66f3bca30ecd3d24ce27a40acc9e57548d354b..1b168a53f274c32b38f3139198b6b50a61571384 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/BoundFieldTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/BoundFieldTest.cs
@@ -130,11 +130,7 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test (Description="Bug 646505")]
                public void BoundField_Bug646505 ()
                {
-#if NET_4_0
                        string originalHtml = "<div>\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"gridView\" style=\"border-collapse:collapse;\">\n\t\t<tr>\n\t\t\t<th scope=\"col\">&nbsp;</th><th scope=\"col\">&nbsp;</th>\n\t\t</tr><tr>\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;gridView$ctl02$ctl00&#39;,&#39;&#39;)\">Update</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;gridView&#39;,&#39;Cancel$0&#39;)\">Cancel</a></td><td><input name=\"gridView$ctl02$ctl02\" type=\"text\" value=\"False\" /></td>\n\t\t</tr><tr>\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;gridView&#39;,&#39;Edit$1&#39;)\">Edit</a></td><td>False</td>\n\t\t</tr>\n\t</table>\n</div>\n";
-#else
-                       string originalHtml = "<div>\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"gridView\" style=\"border-collapse:collapse;\">\n\t\t<tr>\n\t\t\t<th scope=\"col\">&nbsp;</th><th scope=\"col\">&nbsp;</th>\n\t\t</tr><tr>\n\t\t\t<td><a href=\"javascript:__doPostBack('gridView$ctl02$ctl00','')\">Update</a>&nbsp;<a href=\"javascript:__doPostBack('gridView','Cancel$0')\">Cancel</a></td><td><input name=\"gridView$ctl02$ctl02\" type=\"text\" value=\"False\" /></td>\n\t\t</tr><tr>\n\t\t\t<td><a href=\"javascript:__doPostBack('gridView','Edit$1')\">Edit</a></td><td>False</td>\n\t\t</tr>\n\t</table>\n</div>\n";
-#endif
                        WebTest t = new WebTest ("BoundField_Bug646505.aspx");
                        t.Run ();
 
@@ -371,11 +367,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.IsTrue (bf.DoSupportsHtmlEncode, "#A1-3");
 
                        bf.DataFormatString = formatString;
-#if NET_4_0
                        Assert.AreEqual ("&lt;script&gt;alert (&#39;&lt;test&gt;&#39;);&lt;/script&gt;", bf.DoFormatDataValue ("<test>", true), "#A2");
-#else
-                       Assert.AreEqual ("&lt;script&gt;alert ('&lt;test&gt;');&lt;/script&gt;", bf.DoFormatDataValue ("<test>", true), "#A2");
-#endif
                        Assert.AreEqual (String.Format (formatString, "<test>"), bf.DoFormatDataValue ("<test>", false), "#A3");
 
                        bf.HtmlEncodeFormatString = false;
@@ -383,11 +375,7 @@ namespace MonoTests.System.Web.UI.WebControls
 
                        var ec = new EncodingTest ();
                        bf.HtmlEncodeFormatString = true;
-#if NET_4_0
                        Assert.AreEqual ("&lt;script&gt;alert (&#39;&lt;EncodingTest&gt;&amp;&#39;);&lt;/script&gt;", bf.DoFormatDataValue (ec, true), "#A4");
-#else
-                       Assert.AreEqual ("&lt;script&gt;alert ('&lt;EncodingTest&gt;&amp;');&lt;/script&gt;", bf.DoFormatDataValue (ec, true), "#A4");
-#endif
                }
 
                [Test]

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs
index 56760e102278bfad4453d9efa0a4835b8ad2916c..4fc1f75f851e82b4fb9057b3bdf2ebef8040abfa 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs
@@ -823,7 +823,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        RequiredFieldValidator rfv = cp.ChangePasswordTemplateContainer.FindControl ("text1required") as RequiredFieldValidator;
                        Assert.IsNotNull (rfv, "#A2");
                }
-#if NET_4_0
                [Test]
                public void RenderOuterTableForbiddenStyles ()
                {
@@ -890,7 +889,6 @@ namespace MonoTests.System.Web.UI.WebControls
                                }
                        }
                }
-#endif
                [TestFixtureTearDown]
                public void TearDown ()
                {

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/CheckBoxFieldTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/CheckBoxFieldTest.cs
index 5645545eed12686f1b45964eab2c0bd74d8b8a7a..dc40bf111116b71c9ee3bddecb59db087781af3e 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/CheckBoxFieldTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/CheckBoxFieldTest.cs
@@ -127,11 +127,7 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test (Description="Bug 595568 #0")]
                public void CheckBoxField_Bug595568_0 ()
                {
-#if NET_4_0
                        string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"gridView\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span title=\"Dummy\"><input id=\"gridView_ctl00_0\" type=\"checkbox\" name=\"gridView$ctl02$ctl00\" checked=\"checked\" /></span></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span title=\"Dummy\"><input id=\"gridView_ctl00_1\" type=\"checkbox\" name=\"gridView$ctl03$ctl00\" /></span></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span title=\"Dummy\"><input id=\"gridView_ctl00_2\" type=\"checkbox\" name=\"gridView$ctl04$ctl00\" /></span></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"gridView\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span title=\"Dummy\"><input id=\"gridView_ctl02_ctl00\" type=\"checkbox\" name=\"gridView$ctl02$ctl00\" checked=\"checked\" /></span></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span title=\"Dummy\"><input id=\"gridView_ctl03_ctl00\" type=\"checkbox\" name=\"gridView$ctl03$ctl00\" /></span></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span title=\"Dummy\"><input id=\"gridView_ctl04_ctl00\" type=\"checkbox\" name=\"gridView$ctl04$ctl00\" /></span></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        WebTest t = new WebTest ("CheckBoxField_Bug595568_0.aspx");
                        string pageHtml = t.Run ();
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
@@ -142,11 +138,7 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test (Description="Bug 595568 #1")]
                public void CheckBoxField_Bug595568_1 ()
                {
-#if NET_4_0
                        string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"gridView\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><select size=\"4\" name=\"gridView$ctl02$ctl00\">\r\n\r\n\t\t\t</select><span title=\"Dummy\"><input id=\"gridView_ctl01_0\" type=\"checkbox\" name=\"gridView$ctl02$ctl01\" checked=\"checked\" /></span></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><select size=\"4\" name=\"gridView$ctl03$ctl00\">\r\n\r\n\t\t\t</select><span title=\"Dummy\"><input id=\"gridView_ctl01_1\" type=\"checkbox\" name=\"gridView$ctl03$ctl01\" /></span></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><select size=\"4\" name=\"gridView$ctl04$ctl00\">\r\n\r\n\t\t\t</select><span title=\"Dummy\"><input id=\"gridView_ctl01_2\" type=\"checkbox\" name=\"gridView$ctl04$ctl01\" /></span></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"gridView\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><select size=\"4\" name=\"gridView$ctl02$ctl00\">\r\n\r\n\t\t\t</select><span title=\"Dummy\"><input id=\"gridView_ctl02_ctl01\" type=\"checkbox\" name=\"gridView$ctl02$ctl01\" checked=\"checked\" /></span></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><select size=\"4\" name=\"gridView$ctl03$ctl00\">\r\n\r\n\t\t\t</select><span title=\"Dummy\"><input id=\"gridView_ctl03_ctl01\" type=\"checkbox\" name=\"gridView$ctl03$ctl01\" /></span></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><select size=\"4\" name=\"gridView$ctl04$ctl00\">\r\n\r\n\t\t\t</select><span title=\"Dummy\"><input id=\"gridView_ctl04_ctl01\" type=\"checkbox\" name=\"gridView$ctl04$ctl01\" /></span></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        WebTest t = new WebTest ("CheckBoxField_Bug595568_1.aspx");
                        string pageHtml = t.Run ();
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
@@ -157,11 +149,7 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test (Description="Bug 595568 #2")]
                public void CheckBoxField_Bug595568_2 ()
                {
-#if NET_4_0
                        string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"gridView\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input id=\"gridView_ctl00_0\" type=\"checkbox\" name=\"gridView$ctl02$ctl00\" /><span title=\"Dummy\"><input id=\"gridView_ctl01_0\" type=\"checkbox\" name=\"gridView$ctl02$ctl01\" checked=\"checked\" /></span><input id=\"gridView_ctl02_0\" type=\"checkbox\" name=\"gridView$ctl02$ctl02\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input id=\"gridView_ctl00_1\" type=\"checkbox\" name=\"gridView$ctl03$ctl00\" /><span title=\"Dummy\"><input id=\"gridView_ctl01_1\" type=\"checkbox\" name=\"gridView$ctl03$ctl01\" /></span><input id=\"gridView_ctl02_1\" type=\"checkbox\" name=\"gridView$ctl03$ctl02\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input id=\"gridView_ctl00_2\" type=\"checkbox\" name=\"gridView$ctl04$ctl00\" /><span title=\"Dummy\"><input id=\"gridView_ctl01_2\" type=\"checkbox\" name=\"gridView$ctl04$ctl01\" /></span><input id=\"gridView_ctl02_2\" type=\"checkbox\" name=\"gridView$ctl04$ctl02\" /></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"gridView\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input id=\"gridView_ctl02_ctl00\" type=\"checkbox\" name=\"gridView$ctl02$ctl00\" /><span title=\"Dummy\"><input id=\"gridView_ctl02_ctl01\" type=\"checkbox\" name=\"gridView$ctl02$ctl01\" checked=\"checked\" /></span><input id=\"gridView_ctl02_ctl02\" type=\"checkbox\" name=\"gridView$ctl02$ctl02\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input id=\"gridView_ctl03_ctl00\" type=\"checkbox\" name=\"gridView$ctl03$ctl00\" /><span title=\"Dummy\"><input id=\"gridView_ctl03_ctl01\" type=\"checkbox\" name=\"gridView$ctl03$ctl01\" /></span><input id=\"gridView_ctl03_ctl02\" type=\"checkbox\" name=\"gridView$ctl03$ctl02\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input id=\"gridView_ctl04_ctl00\" type=\"checkbox\" name=\"gridView$ctl04$ctl00\" /><span title=\"Dummy\"><input id=\"gridView_ctl04_ctl01\" type=\"checkbox\" name=\"gridView$ctl04$ctl01\" /></span><input id=\"gridView_ctl04_ctl02\" type=\"checkbox\" name=\"gridView$ctl04$ctl02\" /></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        
                        WebTest t = new WebTest ("CheckBoxField_Bug595568_2.aspx");
                        string pageHtml = t.Run ();
@@ -185,11 +173,7 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test (Description="Bug 595568 #6")]
                public void CheckBoxField_Bug595568_6 ()
                {       
-#if NET_4_0
                        string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"gridView\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><select size=\"4\" name=\"gridView$ctl02$ctl00\">\r\n\r\n\t\t\t</select><input id=\"gridView_ctl01_0\" type=\"checkbox\" name=\"gridView$ctl02$ctl01\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><select size=\"4\" name=\"gridView$ctl03$ctl00\">\r\n\r\n\t\t\t</select><input id=\"gridView_ctl01_1\" type=\"checkbox\" name=\"gridView$ctl03$ctl01\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><select size=\"4\" name=\"gridView$ctl04$ctl00\">\r\n\r\n\t\t\t</select><input id=\"gridView_ctl01_2\" type=\"checkbox\" name=\"gridView$ctl04$ctl01\" /></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"gridView\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><select size=\"4\" name=\"gridView$ctl02$ctl00\">\r\n\r\n\t\t\t</select><input id=\"gridView_ctl02_ctl01\" type=\"checkbox\" name=\"gridView$ctl02$ctl01\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><select size=\"4\" name=\"gridView$ctl03$ctl00\">\r\n\r\n\t\t\t</select><input id=\"gridView_ctl03_ctl01\" type=\"checkbox\" name=\"gridView$ctl03$ctl01\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><select size=\"4\" name=\"gridView$ctl04$ctl00\">\r\n\r\n\t\t\t</select><input id=\"gridView_ctl04_ctl01\" type=\"checkbox\" name=\"gridView$ctl04$ctl01\" /></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
 
                        WebTest t = new WebTest ("CheckBoxField_Bug595568_6.aspx");
                        string pageHtml = t.Run ();
@@ -201,11 +185,7 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test (Description="Bug 595568 #7")]
                public void CheckBoxField_Bug595568_7 ()
                {
-#if NET_4_0
                        string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"gridView\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input id=\"gridView_ctl00_0\" type=\"checkbox\" name=\"gridView$ctl02$ctl00\" /><select size=\"4\" name=\"gridView$ctl02$ctl01\">\r\n\r\n\t\t\t</select></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input id=\"gridView_ctl00_1\" type=\"checkbox\" name=\"gridView$ctl03$ctl00\" /><select size=\"4\" name=\"gridView$ctl03$ctl01\">\r\n\r\n\t\t\t</select></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input id=\"gridView_ctl00_2\" type=\"checkbox\" name=\"gridView$ctl04$ctl00\" /><select size=\"4\" name=\"gridView$ctl04$ctl01\">\r\n\r\n\t\t\t</select></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"gridView\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input id=\"gridView_ctl02_ctl00\" type=\"checkbox\" name=\"gridView$ctl02$ctl00\" /><select size=\"4\" name=\"gridView$ctl02$ctl01\">\r\n\r\n\t\t\t</select></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input id=\"gridView_ctl03_ctl00\" type=\"checkbox\" name=\"gridView$ctl03$ctl00\" /><select size=\"4\" name=\"gridView$ctl03$ctl01\">\r\n\r\n\t\t\t</select></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input id=\"gridView_ctl04_ctl00\" type=\"checkbox\" name=\"gridView$ctl04$ctl00\" /><select size=\"4\" name=\"gridView$ctl04$ctl01\">\r\n\r\n\t\t\t</select></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        WebTest t = new WebTest ("CheckBoxField_Bug595568_7.aspx");             
                        string pageHtml = t.Run ();
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/CheckBoxListTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/CheckBoxListTest.cs
index 1860f47b4bfa00af615b2d8ac6d557f3df2bde59..afa86b3835035ba8900af83da9f67c2f203ed23a 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/CheckBoxListTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/CheckBoxListTest.cs
@@ -160,13 +160,8 @@ namespace MonoTests.System.Web.UI.WebControls {
                {
                        WebTest t = new WebTest ("CheckBoxList_Bug377703_1.aspx");
                        t.Invoker = PageInvoker.CreateOnInit (CheckBoxList_Bug377703_1_OnInit);
-#if NET_4_0
                        string origHtmlFirst = "<table id=\"cbxl1\">\r\n\t<tr>\r\n\t\t<td><input id=\"cbxl1_0\" type=\"checkbox\" name=\"cbxl1$0\" value=\"x\" /><label for=\"cbxl1_0\">x</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"cbxl1_1\" type=\"checkbox\" name=\"cbxl1$1\" value=\"y\" /><label for=\"cbxl1_1\">y</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"cbxl1_2\" type=\"checkbox\" name=\"cbxl1$2\" value=\"z\" /><label for=\"cbxl1_2\">z</label></td>\r\n\t</tr>\r\n</table>";
                        string origHtmlSecond = "<table id=\"cbxl1\">\r\n\t<tr>\r\n\t\t<td><input id=\"cbxl1_0\" type=\"checkbox\" name=\"cbxl1$0\" checked=\"checked\" value=\"x\" /><label for=\"cbxl1_0\">x</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"cbxl1_1\" type=\"checkbox\" name=\"cbxl1$1\" value=\"y\" /><label for=\"cbxl1_1\">y</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"cbxl1_2\" type=\"checkbox\" name=\"cbxl1$2\" value=\"z\" /><label for=\"cbxl1_2\">z</label></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origHtmlFirst = "<table id=\"cbxl1\" border=\"0\">\r\n\t<tr>\r\n\t\t<td><input id=\"cbxl1_0\" type=\"checkbox\" name=\"cbxl1$0\" /><label for=\"cbxl1_0\">x</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"cbxl1_1\" type=\"checkbox\" name=\"cbxl1$1\" /><label for=\"cbxl1_1\">y</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"cbxl1_2\" type=\"checkbox\" name=\"cbxl1$2\" /><label for=\"cbxl1_2\">z</label></td>\r\n\t</tr>\r\n</table>";
-                       string origHtmlSecond = "<table id=\"cbxl1\" border=\"0\">\r\n\t<tr>\r\n\t\t<td><input id=\"cbxl1_0\" type=\"checkbox\" name=\"cbxl1$0\" checked=\"checked\" /><label for=\"cbxl1_0\">x</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"cbxl1_1\" type=\"checkbox\" name=\"cbxl1$1\" /><label for=\"cbxl1_1\">y</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"cbxl1_2\" type=\"checkbox\" name=\"cbxl1$2\" /><label for=\"cbxl1_2\">z</label></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string html = t.Run ();
                        string listHtml = HtmlDiff.GetControlFromPageHtml (html);
 
@@ -215,15 +210,9 @@ namespace MonoTests.System.Web.UI.WebControls {
                {
                        WebTest t = new WebTest ("CheckBoxList_Bug377703_2.aspx");
                        t.Invoker = PageInvoker.CreateOnInit (CheckBoxList_Bug377703_2_OnInit);
-#if NET_4_0
                        string origHtmlFirst = "<table id=\"cbxl2\">\r\n\t<tr>\r\n\t\t<td><input id=\"cbxl2_0\" type=\"checkbox\" name=\"cbxl2$0\" value=\"x\" /><label for=\"cbxl2_0\">x</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"cbxl2_1\" type=\"checkbox\" name=\"cbxl2$1\" value=\"y\" /><label for=\"cbxl2_1\">y</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"cbxl2_2\" type=\"checkbox\" name=\"cbxl2$2\" value=\"z\" /><label for=\"cbxl2_2\">z</label></td>\r\n\t</tr>\r\n</table>";
                        string origHtmlSecond = "<table id=\"cbxl2\" class=\"aspNetDisabled\">\r\n\t<tr>\r\n\t\t<td><span class=\"aspNetDisabled\"><input id=\"cbxl2_0\" type=\"checkbox\" name=\"cbxl2$0\" checked=\"checked\" disabled=\"disabled\" value=\"x\" /><label for=\"cbxl2_0\">x</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span class=\"aspNetDisabled\"><input id=\"cbxl2_1\" type=\"checkbox\" name=\"cbxl2$1\" disabled=\"disabled\" value=\"y\" /><label for=\"cbxl2_1\">y</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span class=\"aspNetDisabled\"><input id=\"cbxl2_2\" type=\"checkbox\" name=\"cbxl2$2\" checked=\"checked\" disabled=\"disabled\" value=\"z\" /><label for=\"cbxl2_2\">z</label></span></td>\r\n\t</tr>\r\n</table>";
                        string origHtmlThird = "<table id=\"cbxl2\" class=\"aspNetDisabled\">\r\n\t<tr>\r\n\t\t<td><span class=\"aspNetDisabled\"><input id=\"cbxl2_0\" type=\"checkbox\" name=\"cbxl2$0\" checked=\"checked\" disabled=\"disabled\" value=\"x\" /><label for=\"cbxl2_0\">x</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span class=\"aspNetDisabled\"><input id=\"cbxl2_1\" type=\"checkbox\" name=\"cbxl2$1\" disabled=\"disabled\" value=\"y\" /><label for=\"cbxl2_1\">y</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span class=\"aspNetDisabled\"><input id=\"cbxl2_2\" type=\"checkbox\" name=\"cbxl2$2\" checked=\"checked\" disabled=\"disabled\" value=\"z\" /><label for=\"cbxl2_2\">z</label></span></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origHtmlFirst = "<table id=\"cbxl2\" border=\"0\">\r\n\t<tr>\r\n\t\t<td><input id=\"cbxl2_0\" type=\"checkbox\" name=\"cbxl2$0\" /><label for=\"cbxl2_0\">x</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"cbxl2_1\" type=\"checkbox\" name=\"cbxl2$1\" /><label for=\"cbxl2_1\">y</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"cbxl2_2\" type=\"checkbox\" name=\"cbxl2$2\" /><label for=\"cbxl2_2\">z</label></td>\r\n\t</tr>\r\n</table>";
-                       string origHtmlSecond = "<table id=\"cbxl2\" disabled=\"disabled\" border=\"0\">\r\n\t<tr>\r\n\t\t<td><span disabled=\"disabled\"><input id=\"cbxl2_0\" type=\"checkbox\" name=\"cbxl2$0\" checked=\"checked\" disabled=\"disabled\" /><label for=\"cbxl2_0\">x</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span disabled=\"disabled\"><input id=\"cbxl2_1\" type=\"checkbox\" name=\"cbxl2$1\" disabled=\"disabled\" /><label for=\"cbxl2_1\">y</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span disabled=\"disabled\"><input id=\"cbxl2_2\" type=\"checkbox\" name=\"cbxl2$2\" checked=\"checked\" disabled=\"disabled\" /><label for=\"cbxl2_2\">z</label></span></td>\r\n\t</tr>\r\n</table>";
-                       string origHtmlThird = "<table id=\"cbxl2\" disabled=\"disabled\" border=\"0\">\r\n\t<tr>\r\n\t\t<td><span disabled=\"disabled\"><input id=\"cbxl2_0\" type=\"checkbox\" name=\"cbxl2$0\" checked=\"checked\" disabled=\"disabled\" /><label for=\"cbxl2_0\">x</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span disabled=\"disabled\"><input id=\"cbxl2_1\" type=\"checkbox\" name=\"cbxl2$1\" disabled=\"disabled\" /><label for=\"cbxl2_1\">y</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span disabled=\"disabled\"><input id=\"cbxl2_2\" type=\"checkbox\" name=\"cbxl2$2\" checked=\"checked\" disabled=\"disabled\" /><label for=\"cbxl2_2\">z</label></span></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string html = t.Run ();
                        string listHtml = HtmlDiff.GetControlFromPageHtml (html);
 
@@ -276,11 +265,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                {
                        WebTest t = new WebTest ("CheckBoxList_Bug578770.aspx");
                        t.Invoker = PageInvoker.CreateOnInit (CheckBoxList_Bug578770_OnInit);
-#if NET_4_0
                        string origHtml = "<table id=\"test\">\r\n\t<tr>\r\n\t\t<td><span class=\"aspNetDisabled\"><input id=\"test_0\" type=\"checkbox\" name=\"test$0\" disabled=\"disabled\" value=\"Sun\" /><label for=\"test_0\">Sun</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span><input id=\"test_1\" type=\"checkbox\" name=\"test$1\" value=\"Mon\" /><label for=\"test_1\">Mon</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span><input id=\"test_2\" type=\"checkbox\" name=\"test$2\" value=\"Tue\" /><label for=\"test_2\">Tue</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span><input id=\"test_3\" type=\"checkbox\" name=\"test$3\" value=\"Wed\" /><label for=\"test_3\">Wed</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span><input id=\"test_4\" type=\"checkbox\" name=\"test$4\" value=\"Thu\" /><label for=\"test_4\">Thu</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span><input id=\"test_5\" type=\"checkbox\" name=\"test$5\" value=\"Fri\" /><label for=\"test_5\">Fri</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><span><input id=\"test_6\" type=\"checkbox\" name=\"test$6\" value=\"Sat\" /><label for=\"test_6\">Sat</label></span></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origHtml = "<table id=\"test\" border=\"0\">\r\n\t<tr>\r\n\t\t<td><span disabled=\"disabled\"><input id=\"test_0\" type=\"checkbox\" name=\"test$0\" disabled=\"disabled\" /><label for=\"test_0\">Sun</label></span></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"test_1\" type=\"checkbox\" name=\"test$1\" /><label for=\"test_1\">Mon</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"test_2\" type=\"checkbox\" name=\"test$2\" /><label for=\"test_2\">Tue</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"test_3\" type=\"checkbox\" name=\"test$3\" /><label for=\"test_3\">Wed</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"test_4\" type=\"checkbox\" name=\"test$4\" /><label for=\"test_4\">Thu</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"test_5\" type=\"checkbox\" name=\"test$5\" /><label for=\"test_5\">Fri</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"test_6\" type=\"checkbox\" name=\"test$6\" /><label for=\"test_6\">Sat</label></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string html = t.Run ();
                        string listHtml = HtmlDiff.GetControlFromPageHtml (html);
 
@@ -300,15 +285,9 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void CheckBoxList_Bug600415 ()
                {
                        WebTest t = new WebTest ("CheckBoxList_Bug600415.aspx");
-#if NET_4_0
                        string origHtmlFirst = "<table id=\"checkBoxList\">\r\n\t<tr>\r\n\t\t<td><input id=\"checkBoxList_0\" type=\"checkbox\" name=\"checkBoxList$0\" checked=\"checked\" value=\"Item 1\" /><label for=\"checkBoxList_0\">Item 1</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_1\" type=\"checkbox\" name=\"checkBoxList$1\" value=\"Item 2\" /><label for=\"checkBoxList_1\">Item 2</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_2\" type=\"checkbox\" name=\"checkBoxList$2\" checked=\"checked\" value=\"Item 3\" /><label for=\"checkBoxList_2\">Item 3</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_3\" type=\"checkbox\" name=\"checkBoxList$3\" value=\"Item 4\" /><label for=\"checkBoxList_3\">Item 4</label></td>\r\n\t</tr>\r\n</table>";
                        string origHtmlSecond = "<table id=\"checkBoxList\">\r\n\t<tr>\r\n\t\t<td><input id=\"checkBoxList_0\" type=\"checkbox\" name=\"checkBoxList$0\" value=\"Item 1\" /><label for=\"checkBoxList_0\">Item 1</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_1\" type=\"checkbox\" name=\"checkBoxList$1\" value=\"Item 2\" /><label for=\"checkBoxList_1\">Item 2</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_2\" type=\"checkbox\" name=\"checkBoxList$2\" value=\"Item 3\" /><label for=\"checkBoxList_2\">Item 3</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_3\" type=\"checkbox\" name=\"checkBoxList$3\" value=\"Item 4\" /><label for=\"checkBoxList_3\">Item 4</label></td>\r\n\t</tr>\r\n</table>";
                        string origHtmlThird = "<table id=\"checkBoxList\">\r\n\t<tr>\r\n\t\t<td><input id=\"checkBoxList_0\" type=\"checkbox\" name=\"checkBoxList$0\" checked=\"checked\" value=\"Item 1\" /><label for=\"checkBoxList_0\">Item 1</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_1\" type=\"checkbox\" name=\"checkBoxList$1\" checked=\"checked\" value=\"Item 2\" /><label for=\"checkBoxList_1\">Item 2</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_2\" type=\"checkbox\" name=\"checkBoxList$2\" checked=\"checked\" value=\"Item 3\" /><label for=\"checkBoxList_2\">Item 3</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_3\" type=\"checkbox\" name=\"checkBoxList$3\" checked=\"checked\" value=\"Item 4\" /><label for=\"checkBoxList_3\">Item 4</label></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origHtmlFirst = "<table id=\"checkBoxList\" border=\"0\">\r\n\t<tr>\r\n\t\t<td><input id=\"checkBoxList_0\" type=\"checkbox\" name=\"checkBoxList$0\" checked=\"checked\" /><label for=\"checkBoxList_0\">Item 1</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_1\" type=\"checkbox\" name=\"checkBoxList$1\" /><label for=\"checkBoxList_1\">Item 2</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_2\" type=\"checkbox\" name=\"checkBoxList$2\" checked=\"checked\" /><label for=\"checkBoxList_2\">Item 3</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_3\" type=\"checkbox\" name=\"checkBoxList$3\" /><label for=\"checkBoxList_3\">Item 4</label></td>\r\n\t</tr>\r\n</table>";
-                       string origHtmlSecond = "<table id=\"checkBoxList\" border=\"0\">\r\n\t<tr>\r\n\t\t<td><input id=\"checkBoxList_0\" type=\"checkbox\" name=\"checkBoxList$0\" /><label for=\"checkBoxList_0\">Item 1</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_1\" type=\"checkbox\" name=\"checkBoxList$1\" /><label for=\"checkBoxList_1\">Item 2</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_2\" type=\"checkbox\" name=\"checkBoxList$2\" /><label for=\"checkBoxList_2\">Item 3</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_3\" type=\"checkbox\" name=\"checkBoxList$3\" /><label for=\"checkBoxList_3\">Item 4</label></td>\r\n\t</tr>\r\n</table>";
-                       string origHtmlThird = "<table id=\"checkBoxList\" border=\"0\">\r\n\t<tr>\r\n\t\t<td><input id=\"checkBoxList_0\" type=\"checkbox\" name=\"checkBoxList$0\" checked=\"checked\" /><label for=\"checkBoxList_0\">Item 1</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_1\" type=\"checkbox\" name=\"checkBoxList$1\" checked=\"checked\" /><label for=\"checkBoxList_1\">Item 2</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_2\" type=\"checkbox\" name=\"checkBoxList$2\" checked=\"checked\" /><label for=\"checkBoxList_2\">Item 3</label></td>\r\n\t</tr><tr>\r\n\t\t<td><input id=\"checkBoxList_3\" type=\"checkbox\" name=\"checkBoxList$3\" checked=\"checked\" /><label for=\"checkBoxList_3\">Item 4</label></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string html = t.Run ();
                        string listHtml = HtmlDiff.GetControlFromPageHtml (html);
 
@@ -386,13 +365,8 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Test]
                public void RenderItem ()
                {
-#if NET_4_0
                        string origHtml1 = "<input id=\"0\" type=\"checkbox\" name=\"0\" value=\"value1\" /><label for=\"0\">item1</label>";
                        string origHtml2 = "<input id=\"1\" type=\"checkbox\" name=\"1\" value=\"value2\" /><label for=\"1\">item2</label>";
-#else
-                       string origHtml1 = "<input id=\"0\" type=\"checkbox\" name=\"0\" /><label for=\"0\">item1</label>";
-                       string origHtml2 = "<input id=\"1\" type=\"checkbox\" name=\"1\" /><label for=\"1\">item2</label>";
-#endif
                        CheckBoxListPoker c = new CheckBoxListPoker ();
                        ListItem l1 = new ListItem ("item1", "value1");
                        ListItem l2 = new ListItem ("item2", "value2");
@@ -561,11 +535,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Test]
                public void RepeatInfoRenderItem ()
                {
-#if NET_4_0
                        string origHtml = "<input id=\"0\" type=\"checkbox\" name=\"0\" value=\"one\" /><label for=\"0\">one</label>";
-#else
-                       string origHtml = "<input id=\"0\" type=\"checkbox\" name=\"0\" /><label for=\"0\">one</label>";
-#endif
                        StringWriter sw = new StringWriter ();
                        HtmlTextWriter tw = new HtmlTextWriter (sw);
                        CheckBoxList c = new CheckBoxList ();
@@ -640,13 +610,8 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Category("NotDotNet")] // MS's implementation throws NRE's from these
                public void Render ()
                {
-#if NET_4_0
                        string origHtml1 = "<table>\n\t<tr>\n\t\t<td><input id=\"0\" name=\"0\" type=\"checkbox\" value=\"foo\"/><label for=\"0\">foo</label></td>\n\t</tr>\n</table>";
                        string origHtml2 = "<table>\n\t<tr>\n\t\t<td><input id=\"0\" name=\"0\" type=\"checkbox\" value=\"foo\"/><label for=\"0\">foo</label></td>\n\t</tr>\n</table>";
-#else
-                       string origHtml1 = "<table border=\"0\">\n\t<tr>\n\t\t<td><input id=\"0\" name=\"0\" type=\"checkbox\" /><label for=\"0\">foo</label></td>\n\t</tr>\n</table>";
-                       string origHtml2 = "<table border=\"0\">\n\t<tr>\n\t\t<td><input id=\"0\" name=\"0\" type=\"checkbox\" /><label for=\"0\">foo</label></td>\n\t</tr>\n</table>";
-#endif
                        CheckBoxList c;
                        c = new CheckBoxList ();
                        c.Items.Add ("foo");
@@ -666,19 +631,11 @@ namespace MonoTests.System.Web.UI.WebControls {
                        CheckBoxList c = new CheckBoxList ();
                        c.TabIndex = 5;
                        c.Items.Add ("Item1");
-#if NET_4_0
                        string exp = @"<table>
        <tr>
                <td><input id=""0"" name=""0"" tabindex=""5"" type=""checkbox"" value=""Item1""/><label for=""0"">Item1</label></td>
        </tr>
 </table>";
-#else
-                       string exp = @"<table border=""0"">
-       <tr>
-               <td><input id=""0"" name=""0"" tabindex=""5"" type=""checkbox"" /><label for=""0"">Item1</label></td>
-       </tr>
-</table>";
-#endif
                        Render (c, exp, "B1");
                }
 
@@ -690,19 +647,11 @@ namespace MonoTests.System.Web.UI.WebControls {
                        CheckBoxList c = new CheckBoxList ();
                        c.Enabled = false;
                        c.Items.Add ("Item1");
-#if NET_4_0
                        string exp = @"<table class=""aspNetDisabled"">
        <tr>
                <td><span class=""aspNetDisabled""><input disabled=""disabled"" id=""0"" name=""0"" type=""checkbox"" value=""Item1""/><label for=""0"">Item1</label></span></td>
        </tr>
 </table>";
-#else
-                       string exp = @"<table border=""0"" disabled=""disabled"">
-       <tr>
-               <td><span disabled=""disabled""><input disabled=""disabled"" id=""0"" name=""0"" type=""checkbox"" /><label for=""0"">Item1</label></span></td>
-       </tr>
-</table>";
-#endif
                        Render (c, exp, "C1");
                }       
        class TestCheckBoxList : CheckBoxList

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/CheckBoxTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/CheckBoxTest.cs
index 2bcb4c0f9b343e0acacaac955df5a1375475d39e..1cdc7cdd467125cc74b1f3308c5e2f1f98cf7614 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/CheckBoxTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/CheckBoxTest.cs
@@ -186,11 +186,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        c.InputAttributes.Add ("value", "value1");
                        c.Text = "Title";
                        c.Checked = true;
-#if NET_4_0
                        string origHtml = "<input id=\"\" type=\"checkbox\" checked=\"checked\" value=\"value1\" /><label for=\"\">Title</label>";
-#else
-                       string origHtml = "<input type=\"checkbox\" checked=\"checked\" value=\"value1\" /><label for>Title</label>";
-#endif
                        string html = c.Render ();
                        HtmlDiff.AssertAreEqual (origHtml, html, "#A1");
                }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataGridTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataGridTest.cs
index 1e1daa9a8a28a4f12bc766e426f50b17ce6bf6ae..a957bc84b85b4b9b8d8ababfa8559162f36e91fd 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataGridTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataGridTest.cs
@@ -1577,11 +1577,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        t.Invoker = PageInvoker.CreateOnInit (DataGrid_OnInit);
                        string html = t.Run ();
                        string gridHtml = HtmlDiff.GetControlFromPageHtml (html);
-#if NET_4_0
                        string expectedFirstPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl00&#39;,&#39;&#39;)\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl01&#39;,&#39;&#39;)\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl02&#39;,&#39;&#39;)\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>1</td><td>heh1</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>1</td><td>heh1</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl09$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string expectedFirstPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" border=\"0\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl00','')\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl01','')\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl02','')\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>1</td><td>heh1</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>1</td><td>heh1</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack('DataGrid1$ctl09$ctl01','')\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#endif
 
                        HtmlDiff.AssertAreEqual (expectedFirstPage, gridHtml, "DataGrid initial Render");
 
@@ -1598,11 +1594,7 @@ namespace MonoTests.System.Web.UI.WebControls {
 
                        html = t.Run ();
                        gridHtml = HtmlDiff.GetControlFromPageHtml (html);
-#if NET_4_0
                        string expectedSecondPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl00&#39;,&#39;&#39;)\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl01&#39;,&#39;&#39;)\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl02&#39;,&#39;&#39;)\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>6</td><td>heh6</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>6</td><td>heh6</td><td>Comment 6</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>7</td><td>heh7</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>7</td><td>heh7</td><td>Comment 7</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>8</td><td>heh8</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>8</td><td>heh8</td><td>Comment 8</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>9</td><td>heh9</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>9</td><td>heh9</td><td>Comment 9</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>10</td><td>heh10</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>10</td><td>heh10</td><td>Comment 10</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl09$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Previous</a>&nbsp;<span>Next</span></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string expectedSecondPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" border=\"0\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl00','')\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl01','')\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl02','')\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>6</td><td>heh6</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>6</td><td>heh6</td><td>Comment 6</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>7</td><td>heh7</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>7</td><td>heh7</td><td>Comment 7</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>8</td><td>heh8</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>8</td><td>heh8</td><td>Comment 8</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>9</td><td>heh9</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>9</td><td>heh9</td><td>Comment 9</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>10</td><td>heh10</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>10</td><td>heh10</td><td>Comment 10</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><a href=\"javascript:__doPostBack('DataGrid1$ctl09$ctl00','')\" style=\"color:#333333;\">Previous</a>&nbsp;<span>Next</span></td>\r\n\t</tr>\r\n</table>";
-#endif
                        HtmlDiff.AssertAreEqual (expectedSecondPage, gridHtml, "DataGrid Paging Next");
 
                        fr = new FormRequest (t.Response, "form1");
@@ -1630,11 +1622,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        t.Invoker = PageInvoker.CreateOnInit (DataGrid_OnInit);
                        string html = t.Run ();
                        string gridHtml = HtmlDiff.GetControlFromPageHtml (html);
-#if NET_4_0
                        string expectedFirstPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl00&#39;,&#39;&#39;)\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl01&#39;,&#39;&#39;)\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl02&#39;,&#39;&#39;)\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>1</td><td>heh1</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>1</td><td>heh1</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl09$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string expectedFirstPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" border=\"0\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl00','')\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl01','')\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl02','')\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>1</td><td>heh1</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>1</td><td>heh1</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack('DataGrid1$ctl09$ctl01','')\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#endif
 
                        HtmlDiff.AssertAreEqual (expectedFirstPage, gridHtml, "DataGrid initial Render");
 
@@ -1651,11 +1639,7 @@ namespace MonoTests.System.Web.UI.WebControls {
 
                        html = t.Run ();
                        gridHtml = HtmlDiff.GetControlFromPageHtml (html);
-#if NET_4_0
                        string expectedSecondPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl00&#39;,&#39;&#39;)\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl01&#39;,&#39;&#39;)\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl02&#39;,&#39;&#39;)\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:Green;font-weight:normal;font-style:normal;text-decoration:none;\">\r\n\t\t<td>1</td><td><input name=\"DataGrid1$ctl03$ctl00\" type=\"text\" value=\"heh1\" /></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Update</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl02&#39;,&#39;&#39;)\" style=\"color:#333333;\">Cancel</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl03&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>1</td><td><input name=\"DataGrid1$ctl03$ctl04\" type=\"text\" value=\"heh1\" /></td><td><input name=\"DataGrid1$ctl03$ctl05\" type=\"text\" value=\"Comment 1\" /></td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl09$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string expectedSecondPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" border=\"0\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl00','')\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl01','')\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl02','')\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:Green;font-weight:normal;font-style:normal;text-decoration:none;\">\r\n\t\t<td>1</td><td><input name=\"DataGrid1$ctl03$ctl00\" type=\"text\" value=\"heh1\" /></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl01','')\" style=\"color:#333333;\">Update</a>&nbsp;<a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl02','')\" style=\"color:#333333;\">Cancel</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl03','')\" style=\"color:#333333;\">Delete</a></td><td>1</td><td><input name=\"DataGrid1$ctl03$ctl04\" type=\"text\" value=\"heh1\" /></td><td><input name=\"DataGrid1$ctl03$ctl05\" type=\"text\" value=\"Comment 1\" /></td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack('DataGrid1$ctl09$ctl01','')\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#endif
                        HtmlDiff.AssertAreEqual (expectedSecondPage, gridHtml, "DataGrid Edit");
 
                        fr = new FormRequest (t.Response, "form1");
@@ -1678,11 +1662,7 @@ namespace MonoTests.System.Web.UI.WebControls {
 
                        html = t.Run ();
                        gridHtml = HtmlDiff.GetControlFromPageHtml (html);
-#if NET_4_0
                        string expectedThirdPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl00&#39;,&#39;&#39;)\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl01&#39;,&#39;&#39;)\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl02&#39;,&#39;&#39;)\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>1</td><td>New Value</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>1</td><td>New Value</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl09$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string expectedThirdPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" border=\"0\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl00','')\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl01','')\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl02','')\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>1</td><td>New Value</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>1</td><td>New Value</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack('DataGrid1$ctl09$ctl01','')\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#endif
 
                        HtmlDiff.AssertAreEqual (expectedThirdPage, gridHtml, "DataGrid Update");
 
@@ -1699,11 +1679,7 @@ namespace MonoTests.System.Web.UI.WebControls {
 
                        html = t.Run ();
                        gridHtml = HtmlDiff.GetControlFromPageHtml (html);
-#if NET_4_0
                        string expectedFourthPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl00&#39;,&#39;&#39;)\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl01&#39;,&#39;&#39;)\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl02&#39;,&#39;&#39;)\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>1</td><td>New Value</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>1</td><td>New Value</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>6</td><td>heh6</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>6</td><td>heh6</td><td>Comment 6</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl09$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string expectedFourthPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" border=\"0\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl00','')\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl01','')\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl02','')\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>1</td><td>New Value</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>1</td><td>New Value</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>6</td><td>heh6</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>6</td><td>heh6</td><td>Comment 6</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack('DataGrid1$ctl09$ctl01','')\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#endif
 
                        HtmlDiff.AssertAreEqual (expectedFourthPage, gridHtml, "DataGrid Delete");
                }
@@ -1716,11 +1692,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        t.Invoker = PageInvoker.CreateOnInit (DataGrid_OnInit);
                        string html = t.Run ();
                        string gridHtml = HtmlDiff.GetControlFromPageHtml (html);
-#if NET_4_0
                        string expectedFirstPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl00&#39;,&#39;&#39;)\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl01&#39;,&#39;&#39;)\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl02&#39;,&#39;&#39;)\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>1</td><td>heh1</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>1</td><td>heh1</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl09$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string expectedFirstPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" border=\"0\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl00','')\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl01','')\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl02','')\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>1</td><td>heh1</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>1</td><td>heh1</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack('DataGrid1$ctl09$ctl01','')\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#endif
 
                        HtmlDiff.AssertAreEqual (expectedFirstPage, gridHtml, "DataGrid initial Render");
 
@@ -1733,11 +1705,7 @@ namespace MonoTests.System.Web.UI.WebControls {
 
                        html = t.Run ();
                        gridHtml = HtmlDiff.GetControlFromPageHtml (html);
-#if NET_4_0
                        string expectedSecondPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl00&#39;,&#39;&#39;)\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl01&#39;,&#39;&#39;)\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl02&#39;,&#39;&#39;)\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:Navy;background-color:#FFCC66;font-weight:bold;\">\r\n\t\t<td>1</td><td>heh1</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl00&#39;,&#39;&#39;)\" style=\"color:Navy;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl01&#39;,&#39;&#39;)\" style=\"color:Navy;\">Delete</a></td><td>1</td><td>heh1</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl09$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string expectedSecondPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" border=\"0\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl00','')\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl01','')\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl02','')\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:Navy;background-color:#FFCC66;font-weight:bold;\">\r\n\t\t<td>1</td><td>heh1</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl00','')\" style=\"color:Navy;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl01','')\" style=\"color:Navy;\">Delete</a></td><td>1</td><td>heh1</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack('DataGrid1$ctl09$ctl01','')\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#endif
                        HtmlDiff.AssertAreEqual (expectedSecondPage, gridHtml, "DataGrid Selected 1");
 
                        fr = new FormRequest (t.Response, "form1");
@@ -1749,11 +1717,7 @@ namespace MonoTests.System.Web.UI.WebControls {
 
                        html = t.Run ();
                        gridHtml = HtmlDiff.GetControlFromPageHtml (html);
-#if NET_4_0
                        string expectedThirdPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl00&#39;,&#39;&#39;)\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl01&#39;,&#39;&#39;)\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl02$ctl02&#39;,&#39;&#39;)\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>1</td><td>heh1</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl03$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>1</td><td>heh1</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:Navy;background-color:#FFCC66;font-weight:bold;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl00&#39;,&#39;&#39;)\" style=\"color:Navy;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl04$ctl01&#39;,&#39;&#39;)\" style=\"color:Navy;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl05$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl06$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl00&#39;,&#39;&#39;)\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl07$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack(&#39;DataGrid1$ctl09$ctl01&#39;,&#39;&#39;)\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string expectedThirdPage = "\n        <table cellspacing=\"0\" cellpadding=\"4\" border=\"0\" id=\"DataGrid1\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>ID</td><td>Name</td><td>&nbsp;</td><td>&nbsp;</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl00','')\" style=\"color:White;\">ID</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl01','')\" style=\"color:White;\">Name</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl02$ctl02','')\" style=\"color:White;\">Comment</a></td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>1</td><td>heh1</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl03$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>1</td><td>heh1</td><td>Comment 1</td>\r\n\t</tr><tr style=\"color:Navy;background-color:#FFCC66;font-weight:bold;\">\r\n\t\t<td>2</td><td>heh2</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl00','')\" style=\"color:Navy;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl04$ctl01','')\" style=\"color:Navy;\">Delete</a></td><td>2</td><td>heh2</td><td>Comment 2</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>3</td><td>heh3</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl05$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>3</td><td>heh3</td><td>Comment 3</td>\r\n\t</tr><tr style=\"color:#333333;background-color:White;\">\r\n\t\t<td>4</td><td>heh4</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl06$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>4</td><td>heh4</td><td>Comment 4</td>\r\n\t</tr><tr style=\"color:#333333;background-color:#FFFBD6;\">\r\n\t\t<td>5</td><td>heh5</td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl00','')\" style=\"color:#333333;\">Edit</a></td><td><a href=\"javascript:__doPostBack('DataGrid1$ctl07$ctl01','')\" style=\"color:#333333;\">Delete</a></td><td>5</td><td>heh5</td><td>Comment 5</td>\r\n\t</tr><tr style=\"color:White;background-color:#990000;font-weight:bold;\">\r\n\t\t<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\r\n\t</tr><tr align=\"center\" style=\"color:#333333;background-color:#FFCC66;\">\r\n\t\t<td colspan=\"4\"><span>Previous</span>&nbsp;<a href=\"javascript:__doPostBack('DataGrid1$ctl09$ctl01','')\" style=\"color:#333333;\">Next</a></td>\r\n\t</tr>\r\n</table>";
-#endif
 
                        HtmlDiff.AssertAreEqual (expectedThirdPage, gridHtml, "DataGrid Selected 2");
                }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataKeyTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataKeyTest.cs
index e34fa9b64f695b5be4e809787c13090380b18616..9b34ea95686cf5bf72bcdb6a8ac0401c4bed9c35 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataKeyTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataKeyTest.cs
@@ -67,7 +67,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.AreEqual (2, iDictionary.Count, "AllValuesReferringToKey#1");
                        Assert.AreEqual ("value1", iDictionary[1], "ValueReferringToKey#1");
                }
-#if NET_4_0
                [Test]
                public void DataKey_Equals ()
                {
@@ -229,6 +228,5 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.IsFalse (key1.Equals (key2), "#A17-1");
                        Assert.IsFalse (key2.Equals (key1), "#A17-2");
                }
-#endif
        }
 }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListItemTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListItemTest.cs
index af110da16a89a4e0794df508af2d65e23ac807b9..25684a24f84a37686238a43efb676f674c89f1b0 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListItemTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListItemTest.cs
@@ -241,17 +241,10 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Test]
                public void Controls_Table ()
                {
-#if NET_4_0
                        string origHtml1 = "<tr>\n\t<td>mono</td>\n</tr>";
                        string origHtml2 = "<tr>\n\t<td>mono</td>\n</tr>";
                        string origHtml3 = "<table>\n\t<tr>\n\t\t<td>mono</td>\n\t</tr>\n</table>";
                        string origHtml4 = "<span><table>\n\t<tr>\n\t\t<td>mono</td>\n\t</tr>\n</table></span>";
-#else
-                       string origHtml1 = "<tr>\n\t<td>mono</td>\n</tr>";
-                       string origHtml2 = "<tr>\n\t<td>mono</td>\n</tr>";
-                       string origHtml3 = "<table border=\"0\">\n\t<tr>\n\t\t<td>mono</td>\n\t</tr>\n</table>";
-                       string origHtml4 = "<span><table border=\"0\">\n\t<tr>\n\t\t<td>mono</td>\n\t</tr>\n</table></span>";
-#endif
                        TestDataListItem dli = new TestDataListItem (0, ListItemType.Item);
                        dli.Controls.Add (GetTable ("mono"));
 
@@ -271,17 +264,10 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Test]
                public void Controls_Table_Dual ()
                {
-#if NET_4_0
                        string origHtml1 = "<tr>\n\t<td>mono</td>\n</tr>";
                        string origHtml2 = "<tr>\n\t<td>mono</td>\n</tr>";
                        string origHtml3 = "<table>\n\t<tr>\n\t\t<td>mono</td>\n\t</tr>\n</table><table>\n\t<tr>\n\t\t<td>monkey</td>\n\t</tr>\n</table>";
                        string origHtml4 = "<span><table>\n\t<tr>\n\t\t<td>mono</td>\n\t</tr>\n</table><table>\n\t<tr>\n\t\t<td>monkey</td>\n\t</tr>\n</table></span>";
-#else
-                       string origHtml1 = "<tr>\n\t<td>mono</td>\n</tr>";
-                       string origHtml2 = "<tr>\n\t<td>mono</td>\n</tr>";
-                       string origHtml3 = "<table border=\"0\">\n\t<tr>\n\t\t<td>mono</td>\n\t</tr>\n</table><table border=\"0\">\n\t<tr>\n\t\t<td>monkey</td>\n\t</tr>\n</table>";
-                       string origHtml4 = "<span><table border=\"0\">\n\t<tr>\n\t\t<td>mono</td>\n\t</tr>\n</table><table border=\"0\">\n\t<tr>\n\t\t<td>monkey</td>\n\t</tr>\n</table></span>";
-#endif
                        TestDataListItem dli = new TestDataListItem (0, ListItemType.Item);
                        dli.Controls.Add (GetTable ("mono"));
                        dli.Controls.Add (GetTable ("monkey"));
@@ -315,7 +301,6 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Assert.AreEqual ("mono", dli.Render (false, true), "Render-Empty-F-T");
                        Assert.AreEqual ("<span>mono</span>", dli.Render (false, false), "Render-Empty-F-F");
                }
-#if NET_4_0
                [Test]
                public void SupportsDisabledAttribute ()
                {
@@ -329,6 +314,5 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Assert.AreEqual (ver35, p.RenderingCompatibility, "#A2-1");
                        Assert.IsTrue (p.SupportsDisabledAttribute, "#A2-2");
                }
-#endif
        }
 }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs
index 54ae69e334b2091bd061913106bda958300f400a..9e61762f001f1daa44ddfb8b64bd7fc6bb139acc 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs
@@ -322,7 +322,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 
                        Assert.AreEqual (0, dl.Attributes.Count, "Attributes.Count-2");
                }
-#if NET_4_0
                [Test]
                public void RepeatLayout_Lists ()
                {
@@ -336,7 +335,6 @@ namespace MonoTests.System.Web.UI.WebControls {
                                dl.RepeatLayout = RepeatLayout.UnorderedList;
                        }, "#A2");
                }
-#endif
                [Test]
                public void CleanProperties ()
                {

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataSourceControlTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataSourceControlTest.cs
index af5e33c80e6f453c46e69229956147d2345d4b81..e6a55f8f67e99e62fe83bdb28c7d2f17fb68ccd3 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataSourceControlTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataSourceControlTest.cs
@@ -76,11 +76,7 @@ namespace MonoTests.System.Web.UI.WebControls
                public void DataSourceControl_DefaultProperty ()
                {
                        PokerDataSource ds = new PokerDataSource ();
-#if NET_4_0
                        Assert.AreEqual (String.Empty, ds.ClientID, "ClientID");
-#else
-                       Assert.AreEqual (null, ds.ClientID, "ClientID");
-#endif
                        Assert.IsNotNull (ds.Controls, "Controls#1");
                        Assert.AreEqual ( 0 , ds.Controls.Count , "Controls#2");
                        Assert.AreEqual (false, ds.Visible, "Visible");

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DetailsViewTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DetailsViewTest.cs
index 5813d894d5739d2826a5f32486fa6c849c81cddc..12a7ab9e97bc4ad43efdca1e7f12435ee44c417c 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DetailsViewTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DetailsViewTest.cs
@@ -634,11 +634,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        t.Request = fr;
                        result = t.Run ();
                        string newHtml = HtmlDiff.GetControlFromPageHtml (result);
-#if NET_4_0
                        string origHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\r\n\t</table>\r\n</div><a id=\"LinkButton1\" href=\"javascript:__doPostBack(&#39;LinkButton1&#39;,&#39;&#39;)\">Test</a>";
-#else
-                       string origHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\r\n\t</table>\r\n</div><a id=\"LinkButton1\" href=\"javascript:__doPostBack('LinkButton1','')\">Test</a>";
-#endif
                        HtmlDiff.AssertAreEqual(origHtml, newHtml, "EmptyContentTest");
                }
                
@@ -681,11 +677,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        t.Request = fr;
                        result = t.Run ();
                        string newHtml = HtmlDiff.GetControlFromPageHtml (result); 
-#if NET_4_0
                        string origHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\r\n\t</table>\r\n</div><a id=\"LinkButton1\" href=\"javascript:__doPostBack(&#39;LinkButton1&#39;,&#39;&#39;)\">Test</a>";
-#else
-                       string origHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\r\n\t</table>\r\n</div><a id=\"LinkButton1\" href=\"javascript:__doPostBack('LinkButton1','')\">Test</a>";
-#endif
                        HtmlDiff.AssertAreEqual(origHtml, newHtml, "EmptyFooterTextTest");
                }
                
@@ -727,11 +719,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        t.Request = fr;
                        result = t.Run ();
                        string newHtml = HtmlDiff.GetControlFromPageHtml (result); 
-#if NET_4_0
                        string origHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\r\n\t</table>\r\n</div><a id=\"LinkButton1\" href=\"javascript:__doPostBack(&#39;LinkButton1&#39;,&#39;&#39;)\">Test</a>";
-#else
-                       string origHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\r\n\t</table>\r\n</div><a id=\"LinkButton1\" href=\"javascript:__doPostBack('LinkButton1','')\">Test</a>";
-#endif
                        HtmlDiff.AssertAreEqual(origHtml, newHtml, "EmptyHeaderTextTest");
                }
                
@@ -770,11 +758,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        //t.Invoker = PageInvoker.CreateOnLoad (pd);
                        result = t.Run ();
                        string newHtml = HtmlDiff.GetControlFromPageHtml (result); 
-#if NET_4_0
                        string origHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>Empty Data</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"LinkButton1\" href=\"javascript:__doPostBack(&#39;LinkButton1&#39;,&#39;&#39;)\">Test</a>";
-#else
-                       string origHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>Empty Data</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"LinkButton1\" href=\"javascript:__doPostBack('LinkButton1','')\">Test</a>";
-#endif
                        HtmlDiff.AssertAreEqual(origHtml, newHtml, "EmptyDataTextTest");
                }
 
@@ -879,11 +863,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        string html = new WebTest (PageInvoker.CreateOnLoad (
                                new PageDelegate (DetailsView_DeleteItem))).Run ();
                        string newHtml = HtmlDiff.GetControlFromPageHtml (html);
-#if NET_4_0
                        string origHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1002</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Melanie</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Talmadge</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table>\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Page$2&#39;)\">2</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string origHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1002</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Melanie</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Talmadge</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('ctl01','Page$2')\">2</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (origHtml, newHtml, "DeleteItemMethod");
                }
 
@@ -1204,11 +1184,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.AreEqual (null, tb.Parent, "CreateTable1");
                        Assert.AreEqual (String.Empty, tb.BackImageUrl, "CreateTable2");
                        Assert.AreEqual (0, tb.Rows.Count, "CreateTable3");
-#if NET_4_0
                        Assert.AreEqual (String.Empty, tb.ClientID, "CreateTable3");
-#else
-                       Assert.AreEqual (null, tb.ClientID , "CreateTable3");
-#endif
                        dv.ID = "testId"; //private filed _parentID should be set to "testId"                   
                        tb = dv.DoCreateTable ();
                        Assert.AreEqual (-1, tb.CellSpacing, "CreateTable4");
@@ -1441,11 +1417,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        //Footer Template property is checked.
                        string renderedPageHtml = new WebTest ("FooterTemplateTest.aspx").Run ();
                        string newHtmlValue = HtmlDiff.GetControlFromPageHtml (renderedPageHtml);
-#if NET_4_0
                        string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1001</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Mahesh</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Chand</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\">\n                Footer Template Test<a id=\"DetailsView1_HyperLink1\">Footer</a>\n            </td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table>\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Page$2&#39;)\">2</a></td><td><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Page$3&#39;)\">3</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1001</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Mahesh</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Chand</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\">\n                Footer Template Test<a id=\"DetailsView1_HyperLink1\">Footer</a>\n            </td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('DetailsView1','Page$2')\">2</a></td><td><a href=\"javascript:__doPostBack('DetailsView1','Page$3')\">3</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";       
-#endif
 
                        HtmlDiff.AssertAreEqual (origHtmlValue, newHtmlValue, "RenderFooterTemplate");
                }
@@ -1457,11 +1429,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        //Header Template property is checked
                        string renderedPageHtml = new WebTest ("DetailsViewTemplates.aspx").Run ();
                        string newHtmlValue = HtmlDiff.GetControlFromPageHtml (renderedPageHtml);
-#if NET_4_0
                        string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td colspan=\"2\">\n                Header Template<input type=\"submit\" name=\"DetailsView1$Button1\" value=\"Header button\" id=\"DetailsView1_Button1\" />\n            </td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>ID</td><td>1001</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Mahesh</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Chand</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Delete$0&#39;)\">Delete</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table>\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Page$2&#39;)\">2</a></td><td><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Page$3&#39;)\">3</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td colspan=\"2\">\n                Header Template<input type=\"submit\" name=\"DetailsView1$Button1\" value=\"Header button\" id=\"DetailsView1_Button1\" />\n            </td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>ID</td><td>1001</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Mahesh</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Chand</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack('DetailsView1','Delete$0')\">Delete</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('DetailsView1','Page$2')\">2</a></td><td><a href=\"javascript:__doPostBack('DetailsView1','Page$3')\">3</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (origHtmlValue, newHtmlValue, "RenderHeaderTemplate");
                }
 
@@ -1483,11 +1451,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        string renderedPageHtml = new WebTest ("DetailsViewTemplates_3.aspx").Run ();
                        string newHtmlValue = HtmlDiff.GetControlFromPageHtml (renderedPageHtml);
-#if NET_4_0
                        string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView3\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1001</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Mahesh</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Chand</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack(&#39;DetailsView3&#39;,&#39;$0&#39;)\">TestButtonField</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>&nbsp;</td><td><a></a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Image field</td><td></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>&nbsp;</td><td></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Template Field</td><td style=\"background-color:#FFE0C0;\">&nbsp;</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table>\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;DetailsView3&#39;,&#39;Page$2&#39;)\">2</a></td><td><a href=\"javascript:__doPostBack(&#39;DetailsView3&#39;,&#39;Page$3&#39;)\">3</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView3\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1001</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Mahesh</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Chand</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack('DetailsView3','$0')\">TestButtonField</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>&nbsp;</td><td><a></a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Image field</td><td></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>&nbsp;</td><td></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Template Field</td><td style=\"background-color:#FFE0C0;\">&nbsp;</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('DetailsView3','Page$2')\">2</a></td><td><a href=\"javascript:__doPostBack('DetailsView3','Page$3')\">3</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                                        
                        HtmlDiff.AssertAreEqual (origHtmlValue, newHtmlValue, "RenderDataFields");
                }
@@ -1500,11 +1464,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        t.Invoker = PageInvoker.CreateOnLoad (PagingPostback_Load);
                        string pageHTML = t.Run ();
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHTML);
-#if NET_4_0
                        string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1001</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Mahesh</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Chand</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Edit$0&#39;)\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Delete$0&#39;)\">Delete</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;New$0&#39;)\">New</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table>\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Page$2&#39;)\">2</a></td><td><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Page$3&#39;)\">3</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1001</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Mahesh</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Chand</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack('DetailsView1','Edit$0')\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack('DetailsView1','Delete$0')\">Delete</a>&nbsp;<a href=\"javascript:__doPostBack('DetailsView1','New$0')\">New</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('DetailsView1','Page$2')\">2</a></td><td><a href=\"javascript:__doPostBack('DetailsView1','Page$3')\">3</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (origHtmlValue, renderedHtml, "BeforePagingDataPostback");
                        FormRequest fr = new FormRequest (t.Response, "form1");
                        fr.Controls.Add ("__EVENTTARGET");
@@ -1514,11 +1474,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        t.Request = fr;
                        pageHTML = t.Run ();
                        renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHTML);
-#if NET_4_0
                        origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1002</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Melanie</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Talmadge</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Edit$1&#39;)\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Delete$1&#39;)\">Delete</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;New$1&#39;)\">New</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table>\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Page$1&#39;)\">1</a></td><td><span>2</span></td><td><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Page$3&#39;)\">3</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else                  
-                       origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1002</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Melanie</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Talmadge</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack('DetailsView1','Edit$1')\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack('DetailsView1','Delete$1')\">Delete</a>&nbsp;<a href=\"javascript:__doPostBack('DetailsView1','New$1')\">New</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><a href=\"javascript:__doPostBack('DetailsView1','Page$1')\">1</a></td><td><span>2</span></td><td><a href=\"javascript:__doPostBack('DetailsView1','Page$3')\">3</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (origHtmlValue, renderedHtml, "AfterPagingDataPostback");
 
                        // Checking for change index event fired.
@@ -1589,11 +1545,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        t.Request = fr;                 
                        pageHTML = t.Run ();
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHTML);
-#if NET_4_0
                        string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1001</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td><input name=\"DetailsView1$ctl01\" type=\"text\" value=\"Mahesh\" title=\"FName\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td><input name=\"DetailsView1$ctl02\" type=\"text\" value=\"Chand\" title=\"LName\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack(&#39;DetailsView1$ctl03&#39;,&#39;&#39;)\">Update</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Cancel$0&#39;)\">Cancel</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table>\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Page$2&#39;)\">2</a></td><td><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Page$3&#39;)\">3</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1001</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td><input name=\"DetailsView1$ctl01\" type=\"text\" value=\"Mahesh\" title=\"FName\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td><input name=\"DetailsView1$ctl02\" type=\"text\" value=\"Chand\" title=\"LName\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack('DetailsView1$ctl03','')\">Update</a>&nbsp;<a href=\"javascript:__doPostBack('DetailsView1','Cancel$0')\">Cancel</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('DetailsView1','Page$2')\">2</a></td><td><a href=\"javascript:__doPostBack('DetailsView1','Page$3')\">3</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (origHtmlValue, renderedHtml, "AfterEditPostback");
                        // Checking for change mode event fired.
                        ArrayList eventlist = t.UserData as ArrayList;
@@ -1664,11 +1616,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        pageHTML = t.Run ();
                        //Console.WriteLine ("XXXXFAIL {0}", pageHTML);
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHTML);
-#if NET_4_0
                        string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1002</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Melanie</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Talmadge</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Edit$0&#39;)\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Delete$0&#39;)\">Delete</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;New$0&#39;)\">New</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table>\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Page$2&#39;)\">2</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td>1002</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td>Melanie</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td>Talmadge</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack('DetailsView1','Edit$0')\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack('DetailsView1','Delete$0')\">Delete</a>&nbsp;<a href=\"javascript:__doPostBack('DetailsView1','New$0')\">New</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('DetailsView1','Page$2')\">2</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
 
                        HtmlDiff.AssertAreEqual (origHtmlValue, renderedHtml, "DeleteDataPostback");
                        Assert.AreEqual (false, renderedHtml.Contains ("1001"), "AfterDeletePostback");
@@ -1740,11 +1688,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        t.Request = fr;                 
                        pageHTML = t.Run ();
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHTML);
-#if NET_4_0
                        string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td><input name=\"DetailsView1$ctl01\" type=\"text\" title=\"ID\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td><input name=\"DetailsView1$ctl02\" type=\"text\" title=\"FName\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td><input name=\"DetailsView1$ctl03\" type=\"text\" title=\"LName\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack(&#39;DetailsView1$ctl04&#39;,&#39;&#39;)\">Insert</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;DetailsView1&#39;,&#39;Cancel$-1&#39;)\">Cancel</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string origHtmlValue = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"DetailsView1\" style=\"height:50px;width:125px;border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<td>ID</td><td><input name=\"DetailsView1$ctl01\" type=\"text\" title=\"ID\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FName</td><td><input name=\"DetailsView1$ctl02\" type=\"text\" title=\"FName\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>LName</td><td><input name=\"DetailsView1$ctl03\" type=\"text\" title=\"LName\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><a href=\"javascript:__doPostBack('DetailsView1$ctl04','')\">Insert</a>&nbsp;<a href=\"javascript:__doPostBack('DetailsView1','Cancel$-1')\">Cancel</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";    
-#endif
 
                        HtmlDiff.AssertAreEqual (origHtmlValue, renderedHtml, "InsertDataPostback");
                        

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/EditCommandColumnTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/EditCommandColumnTest.cs
index 5b2987fb5e0376b92b38a854d43e0431f299dab2..85072013f6a48ed3605d0cd8b513ed613f0c7050 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/EditCommandColumnTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/EditCommandColumnTest.cs
@@ -121,11 +121,7 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test]
                public void InitializeCell () 
                {
-#if NET_4_0
                        string origHtml = "<table><tr><td>&nbsp;</td><td>&nbsp;</td><td>one</td><td>two</td><td>three</td></tr><tr><td><a>Edit</a></td><td><input name=\"sucker$ctl02$ctl00\" type=\"submit\" value=\"Bearbeiten\" /></td><td>1</td><td>2</td><td>3</td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr></table>";
-#else
-                       string origHtml = "<table border=\"0\"><tr><td>&nbsp;</td><td>&nbsp;</td><td>one</td><td>two</td><td>three</td></tr><tr><td><a>Edit</a></td><td><input name=\"sucker$ctl02$ctl00\" type=\"submit\" value=\"Bearbeiten\" /></td><td>1</td><td>2</td><td>3</td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr></table>";
-#endif
                        DataGridTest    p = new DataGridTest ();
                        DataTable       table = new DataTable ();
                        EditCommandColumn       e;
@@ -170,11 +166,7 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test]
                public void ThisIsADGTest () 
                {
-#if NET_4_0
                        string origHtml = "<table id=\"sucker_tbl\"><tr><td>&nbsp;</td><td>&nbsp;</td><td>one</td><td>two</td><td>three</td></tr><tr><td><a>Edit</a></td><td><input name=\"sucker$ctl02$ctl00\" type=\"submit\" value=\"Bearbeiten\" /></td><td>1</td><td>2</td><td>3</td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr></table>";
-#else
-                       string origHtml = "<table border=\"0\" id=\"sucker_tbl\"><tr><td>&nbsp;</td><td>&nbsp;</td><td>one</td><td>two</td><td>three</td></tr><tr><td><a>Edit</a></td><td><input name=\"sucker$ctl02$ctl00\" type=\"submit\" value=\"Bearbeiten\" /></td><td>1</td><td>2</td><td>3</td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr></table>";
-#endif
                        DataGridTest    p = new DataGridTest ();
                        DataTable       table = new DataTable ();
                        EditCommandColumn       e;
@@ -228,11 +220,7 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test]
                public void InitializeEditCell () 
                {
-#if NET_4_0
                        string origHtml = "<table><tr><td>&nbsp;</td><td>&nbsp;</td><td>one</td><td>two</td><td>three</td></tr><tr><td><a>Update</a>&nbsp;<a>Cancel</a></td><td><input name=\"sucker$ctl02$ctl00\" type=\"submit\" value=\"Refresh\" />&nbsp;<input name=\"sucker$ctl02$ctl01\" type=\"submit\" value=\"Abbrechen\" /></td><td><input name=\"sucker$ctl02$ctl02\" type=\"text\" value=\"1\" /></td><td><input name=\"sucker$ctl02$ctl03\" type=\"text\" value=\"2\" /></td><td><input name=\"sucker$ctl02$ctl04\" type=\"text\" value=\"3\" /></td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr></table>";
-#else
-                       string origHtml = "<table border=\"0\"><tr><td>&nbsp;</td><td>&nbsp;</td><td>one</td><td>two</td><td>three</td></tr><tr><td><a>Update</a>&nbsp;<a>Cancel</a></td><td><input name=\"sucker$ctl02$ctl00\" type=\"submit\" value=\"Refresh\" />&nbsp;<input name=\"sucker$ctl02$ctl01\" type=\"submit\" value=\"Abbrechen\" /></td><td><input name=\"sucker$ctl02$ctl02\" type=\"text\" value=\"1\" /></td><td><input name=\"sucker$ctl02$ctl03\" type=\"text\" value=\"2\" /></td><td><input name=\"sucker$ctl02$ctl04\" type=\"text\" value=\"3\" /></td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr></table>";
-#endif
                        DataGridTest    p = new DataGridTest ();
                        DataTable       table = new DataTable ();
                        EditCommandColumn       e;

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/FormViewTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/FormViewTest.cs
index b4d8d304db7540d11f79acbf97c5c27983983838..33bb4b6d0937226a2b5c5c52d910ad1213b9ce98 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/FormViewTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/FormViewTest.cs
@@ -349,12 +349,10 @@ namespace MonoTests.System.Web.UI.WebControls
                        public bool GetInitialized () {
                                return Initialized;
                        }
-#if NET_4_0
                        public string CallModifiedOuterTableStylePropertyName ()
                        {
                                return ModifiedOuterTableStylePropertyName ();
                        }
-#endif
                }
                
                class Template : ITemplate
@@ -1570,11 +1568,7 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
                {
                        string renderedPageHtml = new WebTest ("FormViewTest1.aspx").Run ();
                        string newHtmlValue = HtmlDiff.GetControlFromPageHtml (renderedPageHtml);
-#if NET_4_0
                        string origHtmlValue = "<table cellspacing=\"2\" cellpadding=\"3\" rules=\"all\" id=\"FormView1\" style=\"background-color:#DEBA84;border-color:#DEBA84;border-width:1px;border-style:None;\">\r\n\t<tr style=\"color:#8C4510;background-color:#FFF7E7;\">\r\n\t\t<td colspan=\"2\">\n                <span id=\"FormView1_Label1\">1</span>\n            </td>\r\n\t</tr><tr align=\"center\" style=\"color:#8C4510;\">\r\n\t\t<td colspan=\"2\"><table>\r\n\t\t\t<tr>\r\n\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;FormView1&#39;,&#39;Page$2&#39;)\" style=\"color:#8C4510;\">2</a></td><td><a href=\"javascript:__doPostBack(&#39;FormView1&#39;,&#39;Page$3&#39;)\" style=\"color:#8C4510;\">3</a></td><td><a href=\"javascript:__doPostBack(&#39;FormView1&#39;,&#39;Page$4&#39;)\" style=\"color:#8C4510;\">4</a></td><td><a href=\"javascript:__doPostBack(&#39;FormView1&#39;,&#39;Page$5&#39;)\" style=\"color:#8C4510;\">5</a></td><td><a href=\"javascript:__doPostBack(&#39;FormView1&#39;,&#39;Page$6&#39;)\" style=\"color:#8C4510;\">6</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origHtmlValue = "<table cellspacing=\"2\" cellpadding=\"3\" rules=\"all\" border=\"1\" id=\"FormView1\" style=\"background-color:#DEBA84;border-color:#DEBA84;border-width:1px;border-style:None;\">\r\n\t<tr style=\"color:#8C4510;background-color:#FFF7E7;\">\r\n\t\t<td colspan=\"2\">\n                <span id=\"FormView1_Label1\">1</span>\n            </td>\r\n\t</tr><tr align=\"center\" style=\"color:#8C4510;\">\r\n\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('FormView1','Page$2')\" style=\"color:#8C4510;\">2</a></td><td><a href=\"javascript:__doPostBack('FormView1','Page$3')\" style=\"color:#8C4510;\">3</a></td><td><a href=\"javascript:__doPostBack('FormView1','Page$4')\" style=\"color:#8C4510;\">4</a></td><td><a href=\"javascript:__doPostBack('FormView1','Page$5')\" style=\"color:#8C4510;\">5</a></td><td><a href=\"javascript:__doPostBack('FormView1','Page$6')\" style=\"color:#8C4510;\">6</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";         
-#endif
        
                        HtmlDiff.AssertAreEqual (origHtmlValue, newHtmlValue, "RenderSimpleTemplate");                  
                }
@@ -1585,11 +1579,7 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
                {
                        string renderedPageHtml = new WebTest ("FormViewTest1_2.aspx").Run ();
                        string newHtmlValue = HtmlDiff.GetControlFromPageHtml (renderedPageHtml);
-#if NET_4_0
                        string origHtmlValue = "<table cellspacing=\"0\" cellpadding=\"4\" id=\"FormView2\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:#333333;background-color:#F7F6F3;\">\r\n\t\t<td colspan=\"2\">\n                <span id=\"FormView2_Label2\">1</span>\n            </td>\r\n\t</tr><tr style=\"color:White;background-color:#5D7B9D;font-weight:bold;\">\r\n\t\t<td colspan=\"2\">\n                <span id=\"FormView2_Label3\">Footer Template Test</span>\n            </td>\r\n\t</tr><tr align=\"center\" style=\"color:White;background-color:#284775;\">\r\n\t\t<td colspan=\"2\">\n                <input type=\"submit\" name=\"FormView2$ctl01$Button1\" value=\"Prev Item\" id=\"FormView2_ctl01_Button1\" />\n                <input type=\"submit\" name=\"FormView2$ctl01$Button2\" value=\"Next Item\" id=\"FormView2_ctl01_Button2\" />\n                <input type=\"submit\" name=\"FormView2$ctl01$Button3\" value=\"First Item\" id=\"FormView2_ctl01_Button3\" />\n                <input type=\"submit\" name=\"FormView2$ctl01$Button4\" value=\"Last Item\" id=\"FormView2_ctl01_Button4\" />\n            </td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origHtmlValue = "<table cellspacing=\"0\" cellpadding=\"4\" border=\"0\" id=\"FormView2\" style=\"color:#333333;border-collapse:collapse;\">\r\n\t<tr style=\"color:#333333;background-color:#F7F6F3;\">\r\n\t\t<td colspan=\"2\">\n                <span id=\"FormView2_Label2\">1</span>\n            </td>\r\n\t</tr><tr style=\"color:White;background-color:#5D7B9D;font-weight:bold;\">\r\n\t\t<td colspan=\"2\">\n                <span id=\"FormView2_Label3\">Footer Template Test</span>\n            </td>\r\n\t</tr><tr align=\"center\" style=\"color:White;background-color:#284775;\">\r\n\t\t<td colspan=\"2\">\n                <input type=\"submit\" name=\"FormView2$ctl01$Button1\" value=\"Prev Item\" id=\"FormView2_ctl01_Button1\" />\n                <input type=\"submit\" name=\"FormView2$ctl01$Button2\" value=\"Next Item\" id=\"FormView2_ctl01_Button2\" />\n                <input type=\"submit\" name=\"FormView2$ctl01$Button3\" value=\"First Item\" id=\"FormView2_ctl01_Button3\" />\n                <input type=\"submit\" name=\"FormView2$ctl01$Button4\" value=\"Last Item\" id=\"FormView2_ctl01_Button4\" />\n            </td>\r\n\t</tr>\r\n</table>";    
-#endif
                        HtmlDiff.AssertAreEqual (origHtmlValue, newHtmlValue, "FormView_RenderFooterAndPager");
                }
 
@@ -1599,11 +1589,7 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
                {
                        string renderedPageHtml = new WebTest ("FormViewTest1_4.aspx").Run ();
                        string newHtmlValue = HtmlDiff.GetControlFromPageHtml (renderedPageHtml);
-#if NET_4_0
                        string origHtmlValue = "<table cellspacing=\"10\" cellpadding=\"3\" align=\"Right\" rules=\"all\" id=\"FormView4\" style=\"background-color:White;border-color:#CCCCCC;border-width:1px;border-style:None;\">\r\n\t<tr align=\"left\" style=\"color:White;background-color:#006699;font-weight:bold;\">\r\n\t\t<td colspan=\"2\">Using Header Text property</td>\r\n\t</tr><tr align=\"center\" style=\"color:#000066;background-color:Maroon;\">\r\n\t\t<td colspan=\"2\">Using Footer Text property</td>\r\n\t</tr><tr align=\"left\" style=\"color:#000066;background-color:LightGrey;\">\r\n\t\t<td colspan=\"2\">\n                <a id=\"FormView4_ctl01_LinkButton1\" href=\"javascript:__doPostBack(&#39;FormView4$ctl01$LinkButton1&#39;,&#39;&#39;)\">Next</a>\n                <a id=\"FormView4_ctl01_LinkButton2\" href=\"javascript:__doPostBack(&#39;FormView4$ctl01$LinkButton2&#39;,&#39;&#39;)\">Prev</a>\n                <span id=\"FormView4_ctl01_Label7\">Page Index: 0</span>\n            </td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origHtmlValue = "<table cellspacing=\"10\" cellpadding=\"3\" align=\"Right\" rules=\"all\" border=\"1\" id=\"FormView4\" style=\"background-color:White;border-color:#CCCCCC;border-width:1px;border-style:None;\">\r\n\t<tr align=\"left\" style=\"color:White;background-color:#006699;font-weight:bold;\">\r\n\t\t<td colspan=\"2\">Using Header Text property</td>\r\n\t</tr><tr align=\"center\" style=\"color:#000066;background-color:Maroon;\">\r\n\t\t<td colspan=\"2\">Using Footer Text property</td>\r\n\t</tr><tr align=\"left\" style=\"color:#000066;background-color:LightGrey;\">\r\n\t\t<td colspan=\"2\">\n                <a id=\"FormView4_ctl01_LinkButton1\" href=\"javascript:__doPostBack('FormView4$ctl01$LinkButton1','')\">Next</a>\n                <a id=\"FormView4_ctl01_LinkButton2\" href=\"javascript:__doPostBack('FormView4$ctl01$LinkButton2','')\">Prev</a>\n                <span id=\"FormView4_ctl01_Label7\">Page Index: 0</span>\n            </td>\r\n\t</tr>\r\n</table>";                         
-#endif
                        HtmlDiff.AssertAreEqual (origHtmlValue, newHtmlValue, "RenderingDefaultPaging");
                }
 
@@ -1614,11 +1600,7 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
                {
                        string RenderedPageHtml = new WebTest ("FormViewTest1_3.aspx").Run ();
                        string newHtmlValue = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
-#if NET_4_0
                        string origHtmlValue = "<table cellspacing=\"0\" cellpadding=\"2\" id=\"FormView3\" style=\"color:Black;background-color:LightGoldenrodYellow;border-color:Tan;border-width:1px;border-style:solid;border-collapse:collapse;\">\r\n\t<tr align=\"center\" valign=\"top\" style=\"color:#C00000;background-color:Tan;font-weight:bold;\">\r\n\t\t<td colspan=\"2\">\n                <span id=\"FormView3_Label5\">Header Template Test</span>\n            </td>\r\n\t</tr><tr>\r\n\t\t<td colspan=\"2\">\n                <span id=\"FormView3_Label4\">1</span>\n            </td>\r\n\t</tr><tr align=\"right\" style=\"color:#FFC0FF;background-color:Tan;\">\r\n\t\t<td colspan=\"2\">\n                <span id=\"FormView3_Label6\">FormView Footer</span>\n            </td>\r\n\t</tr><tr align=\"center\" style=\"color:DarkSlateBlue;background-color:PaleGoldenrod;\">\r\n\t\t<td colspan=\"2\"><table>\r\n\t\t\t<tr>\r\n\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;FormView3&#39;,&#39;Page$2&#39;)\" style=\"color:DarkSlateBlue;\">2</a></td><td><a href=\"javascript:__doPostBack(&#39;FormView3&#39;,&#39;Page$3&#39;)\" style=\"color:DarkSlateBlue;\">3</a></td><td><a href=\"javascript:__doPostBack(&#39;FormView3&#39;,&#39;Page$4&#39;)\" style=\"color:DarkSlateBlue;\">4</a></td><td><a href=\"javascript:__doPostBack(&#39;FormView3&#39;,&#39;Page$5&#39;)\" style=\"color:DarkSlateBlue;\">5</a></td><td><a href=\"javascript:__doPostBack(&#39;FormView3&#39;,&#39;Page$6&#39;)\" style=\"color:DarkSlateBlue;\">6</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origHtmlValue = "<table cellspacing=\"0\" cellpadding=\"2\" border=\"0\" id=\"FormView3\" style=\"color:Black;background-color:LightGoldenrodYellow;border-color:Tan;border-width:1px;border-style:solid;border-collapse:collapse;\">\r\n\t<tr align=\"center\" valign=\"top\" style=\"color:#C00000;background-color:Tan;font-weight:bold;\">\r\n\t\t<td colspan=\"2\">\n                <span id=\"FormView3_Label5\">Header Template Test</span>\n            </td>\r\n\t</tr><tr>\r\n\t\t<td colspan=\"2\">\n                <span id=\"FormView3_Label4\">1</span>\n            </td>\r\n\t</tr><tr align=\"right\" style=\"color:#FFC0FF;background-color:Tan;\">\r\n\t\t<td colspan=\"2\">\n                <span id=\"FormView3_Label6\">FormView Footer</span>\n            </td>\r\n\t</tr><tr align=\"center\" style=\"color:DarkSlateBlue;background-color:PaleGoldenrod;\">\r\n\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('FormView3','Page$2')\" style=\"color:DarkSlateBlue;\">2</a></td><td><a href=\"javascript:__doPostBack('FormView3','Page$3')\" style=\"color:DarkSlateBlue;\">3</a></td><td><a href=\"javascript:__doPostBack('FormView3','Page$4')\" style=\"color:DarkSlateBlue;\">4</a></td><td><a href=\"javascript:__doPostBack('FormView3','Page$5')\" style=\"color:DarkSlateBlue;\">5</a></td><td><a href=\"javascript:__doPostBack('FormView3','Page$6')\" style=\"color:DarkSlateBlue;\">6</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";        
-#endif
                        HtmlDiff.AssertAreEqual (origHtmlValue, newHtmlValue, "RenderingDefaultPaging");
                }
                
@@ -1630,11 +1612,7 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
                        WebTest t = new WebTest ("FormViewInsertEditDelete.aspx");
                        string pageHTML = t.Run ();
                        string newHtml = HtmlDiff.GetControlFromPageHtml (pageHTML);
-#if NET_4_0
                        string origHtml = "<table cellspacing=\"0\" id=\"FormView1\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td colspan=\"2\">\n                    <span id=\"FormView1_ID\">1001</span>&nbsp;\n                    <span id=\"FormView1_LName\">Chand</span>\n                    <span id=\"FormView1_FName\">Mahesh</span>&nbsp;\n                    <a id=\"FormView1_EditButton\" href=\"javascript:__doPostBack(&#39;FormView1$EditButton&#39;,&#39;&#39;)\">Edit</a>\n                    <a id=\"FormView1_NewButton\" href=\"javascript:__doPostBack(&#39;FormView1$NewButton&#39;,&#39;&#39;)\">New</a>\n                    <a id=\"FormView1_DeleteButton\" href=\"javascript:__doPostBack(&#39;FormView1$DeleteButton&#39;,&#39;&#39;)\">Delete</a>\n                </td>\r\n\t</tr><tr>\r\n\t\t<td colspan=\"2\"><table>\r\n\t\t\t<tr>\r\n\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;FormView1&#39;,&#39;Page$2&#39;)\">2</a></td><td><a href=\"javascript:__doPostBack(&#39;FormView1&#39;,&#39;Page$3&#39;)\">3</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origHtml = "<table cellspacing=\"0\" border=\"0\" id=\"FormView1\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td colspan=\"2\">\n                    <span id=\"FormView1_ID\">1001</span>&nbsp;\n                    <span id=\"FormView1_LName\">Chand</span>\n                    <span id=\"FormView1_FName\">Mahesh</span>&nbsp;\n                    <a id=\"FormView1_EditButton\" href=\"javascript:__doPostBack('FormView1$EditButton','')\">Edit</a>\n                    <a id=\"FormView1_NewButton\" href=\"javascript:__doPostBack('FormView1$NewButton','')\">New</a>\n                    <a id=\"FormView1_DeleteButton\" href=\"javascript:__doPostBack('FormView1$DeleteButton','')\">Delete</a>\n                </td>\r\n\t</tr><tr>\r\n\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('FormView1','Page$2')\">2</a></td><td><a href=\"javascript:__doPostBack('FormView1','Page$3')\">3</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        HtmlDiff.AssertAreEqual (origHtml, newHtml, "BeforeEditPostback");
 
                        //Edit button postback (change to edit mode - buttons "Update" and "Cancel" should appear.
@@ -1647,11 +1625,7 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
                        t.Request = fr;
                        pageHTML = t.Run ();
                        newHtml = HtmlDiff.GetControlFromPageHtml (pageHTML);
-#if NET_4_0
                        origHtml = "<table cellspacing=\"0\" id=\"FormView1\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td colspan=\"2\">\n                    Enter First Name:<input name=\"FormView1$FNameEdit\" type=\"text\" value=\"Mahesh\" id=\"FormView1_FNameEdit\" /><br />\n                    Enter Last Name:<input name=\"FormView1$LNameEdit\" type=\"text\" value=\"Chand\" id=\"FormView1_LNameEdit\" /><br />\n                    <a id=\"FormView1_UpdateButton\" href=\"javascript:__doPostBack(&#39;FormView1$UpdateButton&#39;,&#39;&#39;)\">Update</a>\n                    <a id=\"FormView1_CancelUpdateButton\" href=\"javascript:__doPostBack(&#39;FormView1$CancelUpdateButton&#39;,&#39;&#39;)\">Cancel</a>\n                </td>\r\n\t</tr><tr>\r\n\t\t<td colspan=\"2\"><table>\r\n\t\t\t<tr>\r\n\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;FormView1&#39;,&#39;Page$2&#39;)\">2</a></td><td><a href=\"javascript:__doPostBack(&#39;FormView1&#39;,&#39;Page$3&#39;)\">3</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       origHtml = "<table cellspacing=\"0\" border=\"0\" id=\"FormView1\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td colspan=\"2\">\n                    Enter First Name:<input name=\"FormView1$FNameEdit\" type=\"text\" value=\"Mahesh\" id=\"FormView1_FNameEdit\" /><br />\n                    Enter Last Name:<input name=\"FormView1$LNameEdit\" type=\"text\" value=\"Chand\" id=\"FormView1_LNameEdit\" /><br />\n                    <a id=\"FormView1_UpdateButton\" href=\"javascript:__doPostBack('FormView1$UpdateButton','')\">Update</a>\n                    <a id=\"FormView1_CancelUpdateButton\" href=\"javascript:__doPostBack('FormView1$CancelUpdateButton','')\">Cancel</a>\n                </td>\r\n\t</tr><tr>\r\n\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('FormView1','Page$2')\">2</a></td><td><a href=\"javascript:__doPostBack('FormView1','Page$3')\">3</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        HtmlDiff.AssertAreEqual (origHtml, newHtml, "AfterEditPostback");
 
                        //Update record postback                
@@ -1668,11 +1642,7 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
                        t.Request = fr;
                        pageHTML = t.Run ();
                        newHtml = HtmlDiff.GetControlFromPageHtml (pageHTML);
-#if NET_4_0
                        origHtml = "<table cellspacing=\"0\" id=\"FormView1\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td colspan=\"2\">\n                    <span id=\"FormView1_ID\">1001</span>&nbsp;\n                    <span id=\"FormView1_LName\">Test</span>\n                    <span id=\"FormView1_FName\">Merav</span>&nbsp;\n                    <a id=\"FormView1_EditButton\" href=\"javascript:__doPostBack(&#39;FormView1$EditButton&#39;,&#39;&#39;)\">Edit</a>\n                    <a id=\"FormView1_NewButton\" href=\"javascript:__doPostBack(&#39;FormView1$NewButton&#39;,&#39;&#39;)\">New</a>\n                    <a id=\"FormView1_DeleteButton\" href=\"javascript:__doPostBack(&#39;FormView1$DeleteButton&#39;,&#39;&#39;)\">Delete</a>\n                </td>\r\n\t</tr><tr>\r\n\t\t<td colspan=\"2\"><table>\r\n\t\t\t<tr>\r\n\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;FormView1&#39;,&#39;Page$2&#39;)\">2</a></td><td><a href=\"javascript:__doPostBack(&#39;FormView1&#39;,&#39;Page$3&#39;)\">3</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       origHtml = "<table cellspacing=\"0\" border=\"0\" id=\"FormView1\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td colspan=\"2\">\n                    <span id=\"FormView1_ID\">1001</span>&nbsp;\n                    <span id=\"FormView1_LName\">Test</span>\n                    <span id=\"FormView1_FName\">Merav</span>&nbsp;\n                    <a id=\"FormView1_EditButton\" href=\"javascript:__doPostBack('FormView1$EditButton','')\">Edit</a>\n                    <a id=\"FormView1_NewButton\" href=\"javascript:__doPostBack('FormView1$NewButton','')\">New</a>\n                    <a id=\"FormView1_DeleteButton\" href=\"javascript:__doPostBack('FormView1$DeleteButton','')\">Delete</a>\n                </td>\r\n\t</tr><tr>\r\n\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('FormView1','Page$2')\">2</a></td><td><a href=\"javascript:__doPostBack('FormView1','Page$3')\">3</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        HtmlDiff.AssertAreEqual (origHtml, newHtml, "AfterUpdatePostback"); 
   
                        //Postback to return to Edit mode
@@ -1700,22 +1670,14 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
                        t.Request = fr;
                        pageHTML = t.Run ();
                        newHtml = HtmlDiff.GetControlFromPageHtml (pageHTML);
-#if NET_4_0
                        origHtml = "<table cellspacing=\"0\" id=\"FormView1\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td colspan=\"2\">\n                    <span id=\"FormView1_ID\">1001</span>&nbsp;\n                    <span id=\"FormView1_LName\">Test</span>\n                    <span id=\"FormView1_FName\">Merav</span>&nbsp;\n                    <a id=\"FormView1_EditButton\" href=\"javascript:__doPostBack(&#39;FormView1$EditButton&#39;,&#39;&#39;)\">Edit</a>\n                    <a id=\"FormView1_NewButton\" href=\"javascript:__doPostBack(&#39;FormView1$NewButton&#39;,&#39;&#39;)\">New</a>\n                    <a id=\"FormView1_DeleteButton\" href=\"javascript:__doPostBack(&#39;FormView1$DeleteButton&#39;,&#39;&#39;)\">Delete</a>\n                </td>\r\n\t</tr><tr>\r\n\t\t<td colspan=\"2\"><table>\r\n\t\t\t<tr>\r\n\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;FormView1&#39;,&#39;Page$2&#39;)\">2</a></td><td><a href=\"javascript:__doPostBack(&#39;FormView1&#39;,&#39;Page$3&#39;)\">3</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       origHtml = "<table cellspacing=\"0\" border=\"0\" id=\"FormView1\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td colspan=\"2\">\n                    <span id=\"FormView1_ID\">1001</span>&nbsp;\n                    <span id=\"FormView1_LName\">Test</span>\n                    <span id=\"FormView1_FName\">Merav</span>&nbsp;\n                    <a id=\"FormView1_EditButton\" href=\"javascript:__doPostBack('FormView1$EditButton','')\">Edit</a>\n                    <a id=\"FormView1_NewButton\" href=\"javascript:__doPostBack('FormView1$NewButton','')\">New</a>\n                    <a id=\"FormView1_DeleteButton\" href=\"javascript:__doPostBack('FormView1$DeleteButton','')\">Delete</a>\n                </td>\r\n\t</tr><tr>\r\n\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('FormView1','Page$2')\">2</a></td><td><a href=\"javascript:__doPostBack('FormView1','Page$3')\">3</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        HtmlDiff.AssertAreEqual (origHtml, newHtml, "CancelEditedRecordPostback");   
                }
 
                [Test (Description="Bug #578863")]
                public void FormView_PagerSettings_Visibility ()
                {
-#if NET_4_0
                        string origHtml = "<table cellspacing=\"2\" cellpadding=\"3\" rules=\"all\" id=\"FormView1\" style=\"background-color:#DEBA84;border-color:#DEBA84;border-width:1px;border-style:None;\">\r\n\t<tr style=\"color:#8C4510;background-color:#FFF7E7;\">\r\n\t\t<td colspan=\"2\">\n          <span id=\"FormView1_Label1\">1</span>\n\t</td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origHtml = "<table cellspacing=\"2\" cellpadding=\"3\" rules=\"all\" border=\"1\" id=\"FormView1\" style=\"background-color:#DEBA84;border-color:#DEBA84;border-width:1px;border-style:None;\">\r\n\t<tr style=\"color:#8C4510;background-color:#FFF7E7;\">\r\n\t\t<td colspan=\"2\">\n          <span id=\"FormView1_Label1\">1</span>\n\t</td>\r\n\t</tr>\r\n</table>";
-#endif
                        WebTest t = new WebTest ("FormViewPagerVisibility.aspx");
                        string pageHtml = t.Run ();
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
@@ -2151,11 +2113,7 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
                        t.Request = fr;
                        pageHTML = t.Run ();
                        string newHtml = HtmlDiff.GetControlFromPageHtml (pageHTML);
-#if NET_4_0
                        string origHtml = "<table cellspacing=\"0\" id=\"FormView1\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td colspan=\"2\">\n                    Insert ID:\n                    <input name=\"FormView1$IDInsert\" type=\"text\" id=\"FormView1_IDInsert\" /><br />\n                    Insert First Name:\n                    <input name=\"FormView1$FNameInsert\" type=\"text\" id=\"FormView1_FNameInsert\" />\n                    <br />\n                    Insert Last Name:&nbsp;\n                    <input name=\"FormView1$LNameInsert\" type=\"text\" id=\"FormView1_LNameInsert\" />\n                    <a id=\"FormView1_InsertButton\" href=\"javascript:__doPostBack(&#39;FormView1$InsertButton&#39;,&#39;&#39;)\">Insert</a>\n                    <a id=\"FormView1_CancelInsertButton\" href=\"javascript:__doPostBack(&#39;FormView1$CancelInsertButton&#39;,&#39;&#39;)\">Cancel</a>\n                </td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origHtml = "<table cellspacing=\"0\" border=\"0\" id=\"FormView1\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td colspan=\"2\">\n                    Insert ID:\n                    <input name=\"FormView1$IDInsert\" type=\"text\" id=\"FormView1_IDInsert\" /><br />\n                    Insert First Name:\n                    <input name=\"FormView1$FNameInsert\" type=\"text\" id=\"FormView1_FNameInsert\" />\n                    <br />\n                    Insert Last Name:&nbsp;\n                    <input name=\"FormView1$LNameInsert\" type=\"text\" id=\"FormView1_LNameInsert\" />\n                    <a id=\"FormView1_InsertButton\" href=\"javascript:__doPostBack('FormView1$InsertButton','')\">Insert</a>\n                    <a id=\"FormView1_CancelInsertButton\" href=\"javascript:__doPostBack('FormView1$CancelInsertButton','')\">Cancel</a>\n                </td>\r\n\t</tr>\r\n</table>";
-#endif
                        HtmlDiff.AssertAreEqual (origHtml, newHtml, "InsertPostback");
 
                        //Insert new record
@@ -2418,7 +2376,6 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
                }
 
                public static void BuildTemplateMethod (Control c) { }
-#if NET_4_0
                [Test]
                public void ModifiedOuterTableStylePropertyName ()
                {
@@ -2471,7 +2428,6 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
                        Assert.IsNotNull (props, "#B1-1");
                        Assert.AreEqual ("BackImageUrl", props, "#B1-2");
                }
-#endif
        }
 
        public class TestMyData

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/GridViewTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/GridViewTest.cs
index 2f38ba4b556ad9983b3585b4831ef907f227fc94..7561fd84425b70a803d0918521917d5d9deb3e8c 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/GridViewTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/GridViewTest.cs
@@ -591,7 +591,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        g.UseAccessibleHeader = false;
                        Assert.AreEqual (false, g.UseAccessibleHeader, "UseAccessibleHeader");
                }
-#if NET_4_0
                [Test]
                public void SortedAscendingCellStyle ()
                {
@@ -623,7 +622,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
                        Assert.IsNotNull (g.SortedDescendingHeaderStyle, "#A1-1");
                }
-#endif
                [Test]
                public void GridView_DefaultProtectedProperties ()
                {
@@ -1596,11 +1594,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        string RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (RenderAllowPaging)).Run ();
                        string RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
-#if NET_4_0
                        string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">Item</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Norway</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Sweden</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><table>\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Page$2&#39;)\">2</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">Item</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Norway</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Sweden</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><table border=\"0\">\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('ctl01','Page$2')\">2</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "RenderDefault");
                }
 
@@ -1629,11 +1623,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        string RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (RenderAllowPaging2)).Run ();
                        string RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
-#if NET_4_0
                        string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">Item</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>France</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Italy</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><table>\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Page$1&#39;)\">1</a></td><td><span>2</span></td><td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Page$3&#39;)\">3</a></td><td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Page$4&#39;)\">4</a></td><td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Page$5&#39;)\">...</a></td><td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Page$Last&#39;)\">&gt;&gt;</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">Item</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>France</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Italy</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><table border=\"0\">\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><a href=\"javascript:__doPostBack('ctl01','Page$1')\">1</a></td><td><span>2</span></td><td><a href=\"javascript:__doPostBack('ctl01','Page$3')\">3</a></td><td><a href=\"javascript:__doPostBack('ctl01','Page$4')\">4</a></td><td><a href=\"javascript:__doPostBack('ctl01','Page$5')\">...</a></td><td><a href=\"javascript:__doPostBack('ctl01','Page$Last')\">&gt;&gt;</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "RenderDefault");
                }
 
@@ -1672,11 +1662,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        string RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (RenderProperty)).Run ();
                        string RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
-#if NET_4_0
                                string OriginControlHtml = "<div id=\"__gvctl01__div\">\r\n\t<table cellspacing=\"1\" cellpadding=\"0\" align=\"Justify\" rules=\"rows\" border=\"1\" style=\"background-image:url(http://test);\">\r\n\t\t<caption align=\"Left\">\r\n\t\t\ttest\r\n\t\t</caption><tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Edit$0&#39;)\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Delete$0&#39;)\">Delete</a></td><td>Norway</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Edit$1&#39;)\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Delete$1&#39;)\">Delete</a></td><td>Sweden</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Edit$2&#39;)\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Delete$2&#39;)\">Delete</a></td><td>France</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Edit$3&#39;)\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Delete$3&#39;)\">Delete</a></td><td>Italy</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>&nbsp;</td><td>&nbsp;</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string OriginControlHtml = "<div id=\"__gvctl01__div\">\r\n\t<table cellspacing=\"1\" cellpadding=\"0\" align=\"Justify\" rules=\"rows\" border=\"1\" style=\"background-image:url(http://test);\">\r\n\t\t<caption align=\"Left\">\r\n\t\t\ttest\r\n\t\t</caption><tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack('ctl01','Edit$0')\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack('ctl01','Delete$0')\">Delete</a></td><td>Norway</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack('ctl01','Edit$1')\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack('ctl01','Delete$1')\">Delete</a></td><td>Sweden</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack('ctl01','Edit$2')\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack('ctl01','Delete$2')\">Delete</a></td><td>France</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack('ctl01','Edit$3')\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack('ctl01','Delete$3')\">Delete</a></td><td>Italy</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>&nbsp;</td><td>&nbsp;</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "RenderDefault");
                }
 
@@ -1738,11 +1724,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        string RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (RenderingCheckBoxField)).Run ();
                        string RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
-#if NET_4_0
                        string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">HeaderText</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span class=\"aspNetDisabled\"><input id=\"ctl01_ctl00_0\" type=\"checkbox\" name=\"ctl01$ctl02$ctl00\" checked=\"checked\" disabled=\"disabled\" /></span></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span class=\"aspNetDisabled\"><input id=\"ctl01_ctl00_1\" type=\"checkbox\" name=\"ctl01$ctl03$ctl00\" disabled=\"disabled\" /></span></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FooterText</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">HeaderText</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span disabled=\"disabled\"><input id=\"ctl01_ctl02_ctl00\" type=\"checkbox\" name=\"ctl01$ctl02$ctl00\" checked=\"checked\" disabled=\"disabled\" /></span></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span disabled=\"disabled\"><input id=\"ctl01_ctl03_ctl00\" type=\"checkbox\" name=\"ctl01$ctl03$ctl00\" disabled=\"disabled\" /></span></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FooterText</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "RenderingCheckBoxField");
                }
 
@@ -1751,11 +1733,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        string RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (RenderingCheckBoxField2)).Run ();
                        string RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
-#if NET_4_0
                        string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">bool</th><th scope=\"col\">str</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span class=\"aspNetDisabled\" title=\"bool\"><input id=\"ctl01_ctl00_0\" type=\"checkbox\" name=\"ctl01$ctl02$ctl00\" checked=\"checked\" disabled=\"disabled\" /></span></td><td>1</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span class=\"aspNetDisabled\" title=\"bool\"><input id=\"ctl01_ctl00_1\" type=\"checkbox\" name=\"ctl01$ctl03$ctl00\" disabled=\"disabled\" /></span></td><td>2</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>&nbsp;</td><td>&nbsp;</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">bool</th><th scope=\"col\">str</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span disabled=\"disabled\" title=\"bool\"><input id=\"ctl01_ctl02_ctl00\" type=\"checkbox\" name=\"ctl01$ctl02$ctl00\" checked=\"checked\" disabled=\"disabled\" /></span></td><td>1</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><span disabled=\"disabled\" title=\"bool\"><input id=\"ctl01_ctl03_ctl00\" type=\"checkbox\" name=\"ctl01$ctl03$ctl00\" disabled=\"disabled\" /></span></td><td>2</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>&nbsp;</td><td>&nbsp;</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "RenderingCheckBoxField2");
                }
                
@@ -1764,11 +1742,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        string RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (RenderingImageField)).Run ();
                        string RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
-#if NET_4_0
                        string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">HeaderText</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"1\" alt=\"1\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"2\" alt=\"2\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FooterText</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">HeaderText</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"1\" alt=\"1\" style=\"border-width:0px;\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"2\" alt=\"2\" style=\"border-width:0px;\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FooterText</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "RenderingImageField");
                }
 
@@ -1777,11 +1751,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        string RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (RenderingCommandField)).Run ();
                        string RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
-#if NET_4_0
                        string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">HeaderText</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Edit$0&#39;)\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Delete$0&#39;)\">Delete</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;New$0&#39;)\">New</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Select$0&#39;)\">Select</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Edit$1&#39;)\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Delete$1&#39;)\">Delete</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;New$1&#39;)\">New</a>&nbsp;<a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Select$1&#39;)\">Select</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FooterText</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">HeaderText</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack('ctl01','Edit$0')\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack('ctl01','Delete$0')\">Delete</a>&nbsp;<a href=\"javascript:__doPostBack('ctl01','New$0')\">New</a>&nbsp;<a href=\"javascript:__doPostBack('ctl01','Select$0')\">Select</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack('ctl01','Edit$1')\">Edit</a>&nbsp;<a href=\"javascript:__doPostBack('ctl01','Delete$1')\">Delete</a>&nbsp;<a href=\"javascript:__doPostBack('ctl01','New$1')\">New</a>&nbsp;<a href=\"javascript:__doPostBack('ctl01','Select$1')\">Select</a></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FooterText</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "RenderingCommandField");
                }
 
@@ -1799,11 +1769,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        string RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (RenderingButtonField)).Run ();
                        string RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
-#if NET_4_0
                        string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">HeaderText</th><th scope=\"col\">HeaderText</th><th scope=\"col\">HeaderText</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input type=\"button\" value=\"1\" onclick=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;$0&#39;)\" /></td><td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;cmd2$0&#39;)\">1</a></td><td><input type=\"image\" src=\"\" alt=\"1\" onclick=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;cmd3$0&#39;);return false;\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input type=\"button\" value=\"2\" onclick=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;$1&#39;)\" /></td><td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;cmd2$1&#39;)\">2</a></td><td><input type=\"image\" src=\"\" alt=\"2\" onclick=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;cmd3$1&#39;);return false;\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FooterText</td><td>FooterText</td><td>FooterText</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">HeaderText</th><th scope=\"col\">HeaderText</th><th scope=\"col\">HeaderText</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input type=\"button\" value=\"1\" onclick=\"javascript:__doPostBack('ctl01','$0')\" /></td><td><a href=\"javascript:__doPostBack('ctl01','cmd2$0')\">1</a></td><td><input type=\"image\" src=\"\" alt=\"1\" onclick=\"javascript:__doPostBack('ctl01','cmd3$0')\" style=\"border-width:0px;\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input type=\"button\" value=\"2\" onclick=\"javascript:__doPostBack('ctl01','$1')\" /></td><td><a href=\"javascript:__doPostBack('ctl01','cmd2$1')\">2</a></td><td><input type=\"image\" src=\"\" alt=\"2\" onclick=\"javascript:__doPostBack('ctl01','cmd3$1')\" style=\"border-width:0px;\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>FooterText</td><td>FooterText</td><td>FooterText</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "RenderingButtonField");
                }
 
@@ -1822,11 +1788,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        string RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (RenderingTemplateField)).Run ();
                        string RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
-#if NET_4_0
                        string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"grid\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\"><input name=\"grid$ctl01$TextBox1\" type=\"text\" id=\"grid_TextBox1\" /></th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input name=\"grid$ctl02$TextBox1\" type=\"text\" value=\"1\" id=\"grid_TextBox1_0\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input name=\"grid$ctl03$TextBox1\" type=\"text\" value=\"2\" id=\"grid_TextBox1_1\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input name=\"grid$ctl04$TextBox1\" type=\"text\" id=\"grid_TextBox1\" /></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string OriginControlHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"grid\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\"><input name=\"grid$ctl01$TextBox1\" type=\"text\" id=\"grid_ctl01_TextBox1\" /></th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input name=\"grid$ctl02$TextBox1\" type=\"text\" value=\"1\" id=\"grid_ctl02_TextBox1\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input name=\"grid$ctl03$TextBox1\" type=\"text\" value=\"2\" id=\"grid_ctl03_TextBox1\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><input name=\"grid$ctl04$TextBox1\" type=\"text\" id=\"grid_ctl04_TextBox1\" /></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "RenderingTemplateField");
                }
                

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/HyperLinkTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/HyperLinkTest.cs
index af0ffcd739124e674e8dfe93e393de0c6872bc57..cdfe04bfb997c6d57c3e0bf3116137bd94cfb5a8 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/HyperLinkTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/HyperLinkTest.cs
@@ -81,11 +81,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Test]
                public void ImageUrlWithoutText ()
                {
-#if NET_4_0
                        string origHtml = "<a><img src=\"http://www.mono-project.com/stylesheets/images.wiki.png\" alt=\"\" /></a>";
-#else
-                       string origHtml = "<a><img src=\"http://www.mono-project.com/stylesheets/images.wiki.png\" style=\"border-width:0px;\" /></a>";
-#endif
                        TestHyperLink hl = new TestHyperLink ();
                        hl.ImageUrl = imageUrl;
                        Assert.AreEqual (imageUrl, hl.ImageUrl, "ImageUrl");
@@ -101,11 +97,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Test]
                public void ImageUrlWithoutText_ToolTip ()
                {
-#if NET_4_0
                        string origHtml = "<a title=\"Some message\"><img title=\"Some message\" src=\"http://www.mono-project.com/stylesheets/images.wiki.png\" alt=\"\" /></a>";
-#else
-                       string origHtml = "<a title=\"Some message\"><img title=\"Some message\" src=\"http://www.mono-project.com/stylesheets/images.wiki.png\" style=\"border-width:0px;\" /></a>";
-#endif
                        TestHyperLink hl = new TestHyperLink ();
                        hl.ImageUrl = imageUrl;
                        hl.ToolTip = "Some message";
@@ -136,11 +128,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Test]
                public void ImageUrl_NO_ResolveUrl ()
                {
-#if NET_4_0
                        string origHtml = "<a><img src=\"~/ben.jpeg\" alt=\"\" /></a>";
-#else
-                       string origHtml = "<a><img src=\"~/ben.jpeg\" style=\"border-width:0px;\" /></a>";
-#endif
                        TestHyperLink hl = new TestHyperLink ();
                        hl.ImageUrl = "~/ben.jpeg";
                        Assert.AreEqual ("~/ben.jpeg", hl.ImageUrl, "ImageUrl");

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageButtonTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageButtonTest.cs
index 0cb462e762411aebe15e537b585d7539424cd5c6..f15a00fe4d9d3a9ed3bd47cfac59beda9eeecd96 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageButtonTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageButtonTest.cs
@@ -237,11 +237,7 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test]
                public void Text ()
                {
-#if NET_4_0
                        string origHtml = "<input type=\"image\" src=\"\" alt=\"MyText\" />";
-#else
-                       string origHtml = "<input type=\"image\" src=\"\" alt=\"MyText\" style=\"border-width:0px;\" />";
-#endif
                        PokerImageButton b = new PokerImageButton ();
                        b.Text = "MyText";
                        string html = b.Render ();

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageFieldTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageFieldTest.cs
index 1f9e1bea4ab704bc759344f4af1d7aaba6ad9ca8..b413ce2f2e5023510b6e74a162366a8fc2251cff 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageFieldTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageFieldTest.cs
@@ -299,11 +299,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        t.Invoker = new PageInvoker (pd);
                        
                        string htmlPage = t.Run ();
-#if NET_4_0
                        string htmlOrigin = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"Grid\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">Data</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"Item%200\" alt=\"Item: Item 0\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"Item%201\" alt=\"Item: Item 1\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"Item%202\" alt=\"Item: Item 2\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"Item%203\" alt=\"Item: Item 3\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"Item%204\" alt=\"Item: Item 4\" /></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string htmlOrigin = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"Grid\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">Data</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"Item%200\" alt=\"Item: Item 0\" style=\"border-width:0px;\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"Item%201\" alt=\"Item: Item 1\" style=\"border-width:0px;\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"Item%202\" alt=\"Item: Item 2\" style=\"border-width:0px;\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"Item%203\" alt=\"Item: Item 3\" style=\"border-width:0px;\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"Item%204\" alt=\"Item: Item 4\" style=\"border-width:0px;\" /></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        string htmlControl = HtmlDiff.GetControlFromPageHtml (htmlPage);
                        HtmlDiff.AssertAreEqual (htmlOrigin, htmlControl, "GetFormattedAlternateText");
                }
@@ -372,11 +368,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        pd.PreRender = _ConvertEmptyStringToNull;
                        t.Invoker = new PageInvoker (pd);
                        string htmlPage = t.Run ();
-#if NET_4_0
                        string htmlOrigin = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">Data</th><th scope=\"col\">Field</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"\" /></td><td>&nbsp;</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"\" /></td><td>&nbsp;</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"\" /></td><td>&nbsp;</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"\" /></td><td>&nbsp;</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"\" /></td><td>&nbsp;</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string htmlOrigin = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">Data</th><th scope=\"col\">Field</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"\" style=\"border-width:0px;\" /></td><td>&nbsp;</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"\" style=\"border-width:0px;\" /></td><td>&nbsp;</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"\" style=\"border-width:0px;\" /></td><td>&nbsp;</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"\" style=\"border-width:0px;\" /></td><td>&nbsp;</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td><img src=\"\" style=\"border-width:0px;\" /></td><td>&nbsp;</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        string htmlControl = HtmlDiff.GetControlFromPageHtml (htmlPage);
                        HtmlDiff.AssertAreEqual (htmlOrigin, htmlControl, "ConvertEmptyStringToNull");
                }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageMapTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageMapTest.cs
index 64863d73e78e7ea0e1b8b1e4e1b344035c3c960a..ff078412d93cf85f4d40f3dac18fbdae15c0f47f 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageMapTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageMapTest.cs
@@ -133,11 +133,7 @@ namespace MonoTests.System.Web.UI.WebControls
                public void ImageMap_Defaults_Render ()
                {
                        PokerImageMap imageMap = new PokerImageMap ();
-#if NET_4_0
                        string originalHtml = "<img src=\"\" />";
-#else
-                       string originalHtml = "<img src=\"\" style=\"border-width:0px;\" />";
-#endif
                        string renderedHtml = imageMap.Render ();
                        HtmlDiff.AssertAreEqual (originalHtml, renderedHtml, "RenderDefault");
                }
@@ -154,11 +150,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        CircleHotSpot circle = new CircleHotSpot ();
                        circle.NavigateUrl = "NavigateURL";
                        imageMap.HotSpots.Add (circle);
-#if NET_4_0
                        string originalHtml = "<img src=\"\" usemap=\"#ImageMap\" /><map name=\"ImageMap\" id=\"ImageMap\">\r\n\t<area shape=\"circle\" coords=\"0,0,0\" href=\"NavigateURL\" target=\"Target\" title=\"\" alt=\"\" />\r\n</map>";
-#else
-                       string originalHtml = "<img src=\"\" usemap=\"#ImageMap\" style=\"border-width:0px;\" /><map name=\"ImageMap\" id=\"ImageMap\">\r\n\t<area shape=\"circle\" coords=\"0,0,0\" href=\"NavigateURL\" target=\"Target\" title=\"\" alt=\"\" />\r\n</map>";
-#endif
                        string renderedHtml = imageMap.Render ();
                        HtmlDiff.AssertAreEqual (originalHtml, renderedHtml, "RenderNavigateTextAssigned");
                }
@@ -180,11 +172,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        circle.X = 30;
                        circle.Y = 40;
                        imageMap.HotSpots.Add (circle);
-#if NET_4_0
                        string originalHtml = "<img src=\"\" usemap=\"#ImageMap\" /><map name=\"ImageMap\" id=\"ImageMap\">\r\n\t<area shape=\"circle\" coords=\"30,40,10\" href=\"NavigateURL\" title=\"Circle\" alt=\"Circle\" accesskey=\"A\" tabindex=\"1\" />\r\n</map>";
-#else
-                       string originalHtml = "<img src=\"\" usemap=\"#ImageMap\" style=\"border-width:0px;\" /><map name=\"ImageMap\" id=\"ImageMap\">\r\n\t<area shape=\"circle\" coords=\"30,40,10\" href=\"NavigateURL\" title=\"Circle\" alt=\"Circle\" accesskey=\"A\" tabindex=\"1\" />\r\n</map>";
-#endif
                        string renderedHtml = imageMap.Render ();
                        HtmlDiff.AssertAreEqual (originalHtml, renderedHtml, "RenderNavigateCircleTextAssigned");
                }
@@ -216,11 +204,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        poly.TabIndex = 2;
                        poly.Coordinates = "10,20,30,40,50,60,100,200";
                        imageMap.HotSpots.Add (poly);
-#if NET_4_0
                        string originalHtml = "<img src=\"\" usemap=\"#ImageMap\" /><map name=\"ImageMap\" id=\"ImageMap\">\r\n\t<area shape=\"rect\" coords=\"30,20,40,10\" href=\"NavigateUrlRect\" title=\"Rectangle\" alt=\"Rectangle\" accesskey=\"R\" tabindex=\"1\" /><area shape=\"poly\" coords=\"10,20,30,40,50,60,100,200\" href=\"NavigateUrlPoly\" title=\"Polygon\" alt=\"Polygon\" accesskey=\"P\" tabindex=\"2\" />\r\n</map>";
-#else
-                       string originalHtml = "<img src=\"\" usemap=\"#ImageMap\" style=\"border-width:0px;\" /><map name=\"ImageMap\" id=\"ImageMap\">\r\n\t<area shape=\"rect\" coords=\"30,20,40,10\" href=\"NavigateUrlRect\" title=\"Rectangle\" alt=\"Rectangle\" accesskey=\"R\" tabindex=\"1\" /><area shape=\"poly\" coords=\"10,20,30,40,50,60,100,200\" href=\"NavigateUrlPoly\" title=\"Polygon\" alt=\"Polygon\" accesskey=\"P\" tabindex=\"2\" />\r\n</map>";
-#endif
                        string renderedHtml = imageMap.Render ();
                        HtmlDiff.AssertAreEqual (originalHtml, renderedHtml, "RenderNavigateShapesTextAssigned");
                }
@@ -235,11 +219,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        imageMap.HotSpotMode = HotSpotMode.Inactive;
                        imageMap.Target = "Target";
                        imageMap.HotSpots.Add (new CircleHotSpot ());
-#if NET_4_0
                        string originalHtml = "<img src=\"\" usemap=\"#ImageMap\" /><map name=\"ImageMap\" id=\"ImageMap\">\r\n\t<area shape=\"circle\" coords=\"0,0,0\" nohref=\"true\" title=\"\" alt=\"\" />\r\n</map>";
-#else
-                       string originalHtml = "<img src=\"\" usemap=\"#ImageMap\" style=\"border-width:0px;\" /><map name=\"ImageMap\" id=\"ImageMap\">\r\n\t<area shape=\"circle\" coords=\"0,0,0\" nohref=\"true\" title=\"\" alt=\"\" />\r\n</map>";
-#endif
                        string renderedHtml = imageMap.Render ();
                        HtmlDiff.AssertAreEqual (originalHtml, renderedHtml, "RenderInaciveTextAssigned");
                }
@@ -256,11 +236,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        CircleHotSpot circle = new CircleHotSpot ();
                        circle.NavigateUrl = "NavigateURL";
                        imageMap.HotSpots.Add (circle);
-#if NET_4_0
                        string originalHtml = "<img class=\"aspNetDisabled\" src=\"\" usemap=\"#ImageMap\" /><map name=\"ImageMap\" id=\"ImageMap\">\r\n\t<area shape=\"circle\" coords=\"0,0,0\" target=\"Target\" title=\"\" alt=\"\" />\r\n</map>";
-#else
-                       string originalHtml = "<img disabled=\"disabled\" src=\"\" usemap=\"#ImageMap\" style=\"border-width:0px;\" /><map name=\"ImageMap\" id=\"ImageMap\">\r\n\t<area shape=\"circle\" coords=\"0,0,0\" href=\"NavigateURL\" target=\"Target\" title=\"\" alt=\"\" />\r\n</map>";
-#endif
                        string renderedHtml = imageMap.Render ();
                        HtmlDiff.AssertAreEqual (originalHtml, renderedHtml, "RenderDisabledTextAssigne");
                }
@@ -470,11 +446,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (myPageLoad));
                        #region orig
-#if NET_4_0
                        string strTarget = "<img id=\"imgmap\" src=\"\" usemap=\"#ImageMapimgmap\" /><map name=\"ImageMapimgmap\" id=\"ImageMapimgmap\">\r\n\t<area shape=\"rect\" coords=\"0,0,0,0\" href=\"javascript:__doPostBack(&#39;imgmap&#39;,&#39;0&#39;)\" title=\"\" alt=\"\" /><area shape=\"poly\" coords=\"\" href=\"javascript:__doPostBack(&#39;imgmap&#39;,&#39;1&#39;)\" title=\"\" alt=\"\" /><area shape=\"circle\" coords=\"0,0,0\" href=\"javascript:__doPostBack(&#39;imgmap&#39;,&#39;2&#39;)\" title=\"\" alt=\"\" />\r\n</map>";
-#else
-                       string strTarget = "<img id=\"imgmap\" src=\"\" usemap=\"#ImageMapimgmap\" style=\"border-width:0px;\" /><map name=\"ImageMapimgmap\" id=\"ImageMapimgmap\">\r\n\t<area shape=\"rect\" coords=\"0,0,0,0\" href=\"javascript:__doPostBack('imgmap','0')\" title=\"\" alt=\"\" /><area shape=\"poly\" coords=\"\" href=\"javascript:__doPostBack('imgmap','1')\" title=\"\" alt=\"\" /><area shape=\"circle\" coords=\"0,0,0\" href=\"javascript:__doPostBack('imgmap','2')\" title=\"\" alt=\"\" />\r\n</map>";
-#endif
                        #endregion
                        string RenderedPageHtml = t.Run ();
                        string RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
@@ -494,11 +466,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        fr.Controls["__EVENTARGUMENT"].Value = "0";
                        t.Request = fr;
                        #region orig
-#if NET_4_0
                        string strTarget = "<img id=\"imgmap\" src=\"\" usemap=\"#ImageMapimgmap\" /><map name=\"ImageMapimgmap\" id=\"ImageMapimgmap\">\r\n\t<area shape=\"rect\" coords=\"0,0,0,0\" href=\"javascript:__doPostBack(&#39;imgmap&#39;,&#39;0&#39;)\" title=\"\" alt=\"\" /><area shape=\"poly\" coords=\"\" href=\"javascript:__doPostBack(&#39;imgmap&#39;,&#39;1&#39;)\" title=\"\" alt=\"\" /><area shape=\"circle\" coords=\"0,0,0\" href=\"javascript:__doPostBack(&#39;imgmap&#39;,&#39;2&#39;)\" title=\"\" alt=\"\" />\r\n</map>";
-#else
-                       string strTarget = "<img id=\"imgmap\" src=\"\" usemap=\"#ImageMapimgmap\" style=\"border-width:0px;\" /><map name=\"ImageMapimgmap\" id=\"ImageMapimgmap\">\r\n\t<area shape=\"rect\" coords=\"0,0,0,0\" href=\"javascript:__doPostBack('imgmap','0')\" title=\"\" alt=\"\" /><area shape=\"poly\" coords=\"\" href=\"javascript:__doPostBack('imgmap','1')\" title=\"\" alt=\"\" /><area shape=\"circle\" coords=\"0,0,0\" href=\"javascript:__doPostBack('imgmap','2')\" title=\"\" alt=\"\" />\r\n</map>";
-#endif
                        #endregion
                        string RenderedPageHtml = t.Run ();
                        string RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageTest.cs
index 3bc92fa124487dd75cbed1437a99062c90f83609..2afd9e1b6a9ce8c12b92e15b69c59439039a5222 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageTest.cs
@@ -167,11 +167,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        img.Enabled = false;
 
                        string html = img.Render ();
-#if NET_4_0
                        Assert.IsTrue (html.IndexOf (" class=\"aspNetDisabled\"") > 0, "#");
-#else
-                       Assert.IsTrue (html.IndexOf (" disabled=\"") > 0, "#");
-#endif
                }
 
                [Test]
@@ -196,21 +192,12 @@ namespace MonoTests.System.Web.UI.WebControls {
                        s = i.Render ();
                        Assert.IsTrue (i.Render ().IndexOf (" alt=\"alt\"") > 0, "alt");
                        i.AlternateText = String.Empty;
-#if NET_4_0
                        s = i.Render ();
                        Assert.IsTrue (s.IndexOf (" class=\"aspNetDisabled\"") < 0, "enabled");
                        i.Enabled = false;
                        s = i.Render ();
                        Assert.IsTrue (s.IndexOf (" class=\"aspNetDisabled\"") > 0, "disabled");
                        i.Enabled = true;
-#else
-                       s = i.Render ();
-                       Assert.IsTrue (i.Render ().IndexOf (" disabled=\"disabled\"") < 0, "enabled");
-                       i.Enabled = false;
-                       s = i.Render ();
-                       Assert.IsTrue (i.Render ().IndexOf (" disabled=\"disabled\"") > 0, "disabled");
-                       i.Enabled = true;
-#endif
 
                        // note: align is in mixed-case in 1.x so we lower everything to test
                        i.ImageAlign = ImageAlign.AbsBottom;

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
index bb97516436660db62002bfb0b36ee5209277622e..02fc8537059ed040c765786aa6c3efaa53bb8f72 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
@@ -73,7 +73,6 @@ namespace MonoTests.System.Web.UI.WebControls
        [TestFixture]
        public class MasterPageTest
        {
-#if NET_4_0
                class MyTemplate : ITemplate
                {
                        public const string MyText = "|MyTemplate.InstantiateIn called|";
@@ -93,7 +92,6 @@ namespace MonoTests.System.Web.UI.WebControls
                                container.Controls.Add (new LiteralControl (MyText));
                        }
                }
-#endif
                [TestFixtureSetUp]
                public void CopyTestResources ()
                {
@@ -215,7 +213,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        if (PageRenderHtml.IndexOf ("FromMasterMethod") < 0)
                                Assert.Fail ("MasterType TypeName test failed");
                }
-#if NET_4_0
                [Test]
                public void InstantiateInContentPlaceHolder ()
                {
@@ -295,7 +292,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        return false;
                }
 
-#endif
                public static void _RenderDefault (Page p)
                {
                        p.Form.Controls.Add(new LiteralControl("Page dynamic text"));

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuItemBindingTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuItemBindingTest.cs
index a9107f858520f4202da2ede25c2ffe0b633844c8..7921e1e2348d441498dee5dbb17dce439ac1fa61 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuItemBindingTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuItemBindingTest.cs
@@ -31,7 +31,6 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 
 using NUnit.Framework;
-#if NET_4_0
 namespace MonoTests.System.Web.UI.WebControls
 {
        [TestFixture]
@@ -126,4 +125,3 @@ namespace MonoTests.System.Web.UI.WebControls
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
index c4defa6b5dccd209fafc7eb2e185725645954dfe..868e447a2761274ed4b95ac2ed602db9a81d46f9 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
@@ -55,9 +55,7 @@ namespace MonoTests.System.Web.UI.WebControls
        {
                public MenuTable ()
                {
-#if NET_4_0
                        RenderingMode = MenuRenderingMode.Table;
-#endif
                }
        }
        
@@ -180,11 +178,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.IsNotNull (p.StaticMenuStyle, "StaticMenuStyle");
                        Assert.AreEqual ("", p.StaticPopOutImageUrl, "StaticPopOutImageUrl");
                        Assert.IsNotNull (p.StaticSelectedStyle, "StaticSelectedStyle");
-#if NET_4_0
                        Assert.IsTrue (p.StaticSubMenuIndent.IsEmpty, "StaticSubMenuIndent");
-#else
-                       Assert.AreEqual (Unit.Pixel(16), p.StaticSubMenuIndent, "StaticSubMenuIndent");
-#endif
                        Assert.AreEqual ("", p.StaticTopSeparatorImageUrl, "StaticTopSeparatorImageUrl");
                        Assert.AreEqual ("", p.Target, "Target");
                        Assert.IsNotNull (p.OnTagKey (), "TagKey");
@@ -412,22 +406,15 @@ namespace MonoTests.System.Web.UI.WebControls
                public static void _BeginTagRender(Page p)
                {
                        PokerMenu pm = new PokerMenu ();
-#if NET_4_0
                        pm.RenderingCompatibility = new Version (2, 0);
-#endif
                        p.Form.Controls.Add (pm);
                        StringWriter sw = new StringWriter ();
                        HtmlTextWriter tw = new HtmlTextWriter (sw);
                        pm.RenderBeginTag (tw);
                        string RenderedControlHtml = sw.ToString();
-#if NET_4_0
                        string OriginControlHtml = "<a href=\"#ctl01_SkipLink\"><img alt=\"Skip Navigation Links\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><table id=\"ctl01\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\r\n";
-#else
-                       string OriginControlHtml = "<a href=\"#ctl01_SkipLink\"><img alt=\"Skip Navigation Links\" src=\"/NunitWeb/WebResource.axd?d=4RHYfeNnynkXiM59uthjZg2&amp;t=633802729995006876\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><table id=\"ctl01\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\r\n";
-#endif
                        HtmlDiff.AssertAreEqual(OriginControlHtml,RenderedControlHtml,"RenderBeginTag");
                }
-#if NET_4_0
                [Test]
                [Category ("NunitWeb")]
                public void Menu_RenderBeginTag_List ()
@@ -449,7 +436,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        string OriginControlHtml = "<a href=\"#ctl01_SkipLink\"><img alt=\"Skip Navigation Links\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"ctl01\">\r\n";
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "RenderBeginTag_List");
                }
-#endif
                [Test]
                [Category ("NunitWeb")]
                public void Menu_RenderEndTag ()
@@ -459,23 +445,16 @@ namespace MonoTests.System.Web.UI.WebControls
                public static void _EndTagRender (Page p)
                {
                        PokerMenu pm = new PokerMenu ();
-#if NET_4_0
                        pm.RenderingCompatibility = new Version (2, 0);
-#endif
                        p.Form.Controls.Add (pm);
                        StringWriter sw = new StringWriter ();
                        HtmlTextWriter tw = new HtmlTextWriter (sw);
                        pm.RenderBeginTag (tw);
                        pm.RenderEndTag (tw);
                        string RenderedControlHtml = sw.ToString ();
-#if NET_4_0
                        string OriginControlHtml = "<a href=\"#ctl01_SkipLink\"><img alt=\"Skip Navigation Links\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><table id=\"ctl01\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\r\n\r\n</table><a id=\"ctl01_SkipLink\"></a>";
-#else
-                       string OriginControlHtml = "<a href=\"#ctl01_SkipLink\"><img alt=\"Skip Navigation Links\" src=\"/NunitWeb/WebResource.axd?d=4RHYfeNnynkXiM59uthjZg2&amp;t=633802729995006876\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><table id=\"ctl01\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\r\n\r\n</table><a id=\"ctl01_SkipLink\"></a>";
-#endif
                        HtmlDiff.AssertAreEqual(OriginControlHtml, RenderedControlHtml,"RenderEndTag"); 
                }
-#if NET_4_0
                [Test]
                [Category ("NunitWeb")]
                public void Menu_RenderEndTag_List ()
@@ -497,7 +476,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        string OriginControlHtml = "<a href=\"#ctl01_SkipLink\"><img alt=\"Skip Navigation Links\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"ctl01\">\r\n\r\n</div><a id=\"ctl01_SkipLink\"></a>";
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "RenderEndTag");
                }
-#endif
                [Test]
                public void Menu_DataBind () {
                        Page p = new Page ();
@@ -555,9 +533,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        p.Form.Controls.Add (xmlDs);
 
                        Menu m = CreateMenu ();
-#if NET_4_0
                        m.RenderingMode = MenuRenderingMode.Table;
-#endif
                        m.DataSourceID = "XmlDataSource";
                        m.MenuItemDataBound += new MenuEventHandler (m_MenuItemDataBound);
                        p.Form.Controls.Add (m);
@@ -951,250 +927,29 @@ namespace MonoTests.System.Web.UI.WebControls
                public void Menu_RenderStaticItems () {
                        string RenderedPageHtml, RenderedControlHtml, OriginControlHtml;
                        #region OriginControlHtml
-#if NET_4_0
                        OriginControlHtml = "<a href=\"#Menu_SkipLink\"><img alt=\"Skip Navigation Links\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><table id=\"Menu\" class=\"Menu_2\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\r\n\t<tr onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun0\">\r\n\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value&#39;)\">one-black</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr><tr>\r\n\t\t<td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t<tr onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun1\">\r\n\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value&#39;)\" style=\"margin-left:16px;\">two-black-1</a></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t\t\t<tr onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun2\">\r\n\t\t\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value\\\\three-black-1-value&#39;)\" style=\"margin-left:32px;\">three-black-1</a></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t</tr><tr>\r\n\t\t\t\t\t\t<td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun3\">\r\n\t\t\t\t\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value\\\\three-black-1-value\\\\four-black-1-value&#39;)\" style=\"margin-left:48px;\">four-black-1</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t\t\t</tr><tr onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun4\">\r\n\t\t\t\t\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value\\\\three-black-1-value\\\\four-black-2-value&#39;)\" style=\"margin-left:48px;\">four-black-2</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t</tr><tr onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun5\">\r\n\t\t\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value\\\\three-black-2-value&#39;)\" style=\"margin-left:32px;\">three-black-2</a></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t</tr><tr>\r\n\t\t\t\t\t\t<td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun6\">\r\n\t\t\t\t\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value\\\\three-black-2-value\\\\four-black-3-value&#39;)\" style=\"margin-left:48px;\">four-black-3</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t\t\t</tr><tr onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun7\">\r\n\t\t\t\t\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value\\\\three-black-2-value\\\\four-black-4-value&#39;)\" style=\"margin-left:48px;\">four-black-4</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr><tr onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun8\">\r\n\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value&#39;)\" style=\"margin-left:16px;\">two-black-2</a></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t\t\t<tr onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun9\">\r\n\t\t\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value\\\\three-black-3-value&#39;)\" style=\"margin-left:32px;\">three-black-3</a></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t</tr><tr>\r\n\t\t\t\t\t\t<td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun10\">\r\n\t\t\t\t\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value\\\\three-black-3-value\\\\four-black-5-value&#39;)\" style=\"margin-left:48px;\">four-black-5</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t\t\t</tr><tr onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun11\">\r\n\t\t\t\t\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value\\\\three-black-3-value\\\\four-black-6-value&#39;)\" style=\"margin-left:48px;\">four-black-6</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t</tr><tr onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun12\">\r\n\t\t\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value\\\\three-black-4-value&#39;)\" style=\"margin-left:32px;\">three-black-4</a></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t</tr><tr>\r\n\t\t\t\t\t\t<td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun13\">\r\n\t\t\t\t\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value\\\\three-black-4-value\\\\four-black-7-value&#39;)\" style=\"margin-left:48px;\">four-black-7</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t\t\t</tr><tr onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun14\">\r\n\t\t\t\t\t\t\t\t<td><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;width:100%;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value\\\\three-black-4-value\\\\four-black-8-value&#39;)\" style=\"margin-left:48px;\">four-black-8</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table><a id=\"Menu_SkipLink\"></a>";
-#else
-                       OriginControlHtml = @"<a href=""#Menu_SkipLink""><img alt=""Skip Navigation Links"" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><table id=""Menu"" class=""Menu_2"" cellpadding=""0"" cellspacing=""0"" border=""0"">
-       <tr onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun0"">
-               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                       <tr>
-                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value')"">one-black</a></td>
-                       </tr>
-               </table></td>
-       </tr><tr>
-               <td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                       <tr onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun1"">
-                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                       <tr>
-                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value')"" style=""margin-left:16px;"">two-black-1</a></td>
-                                       </tr>
-                               </table></td>
-                       </tr><tr>
-                               <td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                                       <tr onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun2"">
-                                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                       <tr>
-                                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value\\three-black-1-value')"" style=""margin-left:32px;"">three-black-1</a></td>
-                                                       </tr>
-                                               </table></td>
-                                       </tr><tr>
-                                               <td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                                                       <tr onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun3"">
-                                                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value\\three-black-1-value\\four-black-1-value')"" style=""margin-left:48px;"">four-black-1</a></td>
-                                                                       </tr>
-                                                               </table></td>
-                                                       </tr><tr onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun4"">
-                                                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value\\three-black-1-value\\four-black-2-value')"" style=""margin-left:48px;"">four-black-2</a></td>
-                                                                       </tr>
-                                                               </table></td>
-                                                       </tr>
-                                               </table></td>
-                                       </tr><tr onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun5"">
-                                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                       <tr>
-                                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value\\three-black-2-value')"" style=""margin-left:32px;"">three-black-2</a></td>
-                                                       </tr>
-                                               </table></td>
-                                       </tr><tr>
-                                               <td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                                                       <tr onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun6"">
-                                                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value\\three-black-2-value\\four-black-3-value')"" style=""margin-left:48px;"">four-black-3</a></td>
-                                                                       </tr>
-                                                               </table></td>
-                                                       </tr><tr onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun7"">
-                                                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value\\three-black-2-value\\four-black-4-value')"" style=""margin-left:48px;"">four-black-4</a></td>
-                                                                       </tr>
-                                                               </table></td>
-                                                       </tr>
-                                               </table></td>
-                                       </tr>
-                               </table></td>
-                       </tr><tr onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun8"">
-                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                       <tr>
-                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value')"" style=""margin-left:16px;"">two-black-2</a></td>
-                                       </tr>
-                               </table></td>
-                       </tr><tr>
-                               <td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                                       <tr onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun9"">
-                                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                       <tr>
-                                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value\\three-black-3-value')"" style=""margin-left:32px;"">three-black-3</a></td>
-                                                       </tr>
-                                               </table></td>
-                                       </tr><tr>
-                                               <td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                                                       <tr onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun10"">
-                                                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value\\three-black-3-value\\four-black-5-value')"" style=""margin-left:48px;"">four-black-5</a></td>
-                                                                       </tr>
-                                                               </table></td>
-                                                       </tr><tr onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun11"">
-                                                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value\\three-black-3-value\\four-black-6-value')"" style=""margin-left:48px;"">four-black-6</a></td>
-                                                                       </tr>
-                                                               </table></td>
-                                                       </tr>
-                                               </table></td>
-                                       </tr><tr onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun12"">
-                                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                       <tr>
-                                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value\\three-black-4-value')"" style=""margin-left:32px;"">three-black-4</a></td>
-                                                       </tr>
-                                               </table></td>
-                                       </tr><tr>
-                                               <td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                                                       <tr onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun13"">
-                                                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value\\three-black-4-value\\four-black-7-value')"" style=""margin-left:48px;"">four-black-7</a></td>
-                                                                       </tr>
-                                                               </table></td>
-                                                       </tr><tr onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun14"">
-                                                               <td><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;width:100%;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value\\three-black-4-value\\four-black-8-value')"" style=""margin-left:48px;"">four-black-8</a></td>
-                                                                       </tr>
-                                                               </table></td>
-                                                       </tr>
-                                               </table></td>
-                                       </tr>
-                               </table></td>
-                       </tr>
-               </table></td>
-       </tr>
-</table><a id=""Menu_SkipLink""></a>";
-#endif
                        #endregion
                        RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (Menu_RenderStaticItems_Vertical)).Run ();
                        RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "Menu_RenderStaticItems_Vertical");
-#if !NET_4_0 || (NET_4_0 && !DOT_NET)
+#if !DOT_NET
                        // Throws NREX on .NET 4.0, most probably because the adapter's Control is null
                        RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (Menu_RenderStaticItemsWithBaseAdapter_Vertical)).Run ();
                        RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "Menu_RenderStaticItemsWithDefaultAdapter_Vertical");
 #endif
                        #region OriginControlHtml
-#if NET_4_0
                        OriginControlHtml = "<a href=\"#Menu_SkipLink\"><img alt=\"Skip Navigation Links\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><table id=\"Menu\" class=\"Menu_2\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\r\n\t<tr>\r\n\t\t<td onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun0\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value&#39;)\">one-black</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td><td style=\"width:3px;\"></td><td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun1\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value&#39;)\" style=\"margin-left:16px;\">two-black-1</a></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td><td style=\"width:3px;\"></td><td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun2\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value\\\\three-black-1-value&#39;)\" style=\"margin-left:32px;\">three-black-1</a></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td><td style=\"width:3px;\"></td><td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t<td onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun3\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value\\\\three-black-1-value\\\\four-black-1-value&#39;)\" style=\"margin-left:48px;\">four-black-1</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td><td style=\"width:3px;\"></td><td onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun4\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value\\\\three-black-1-value\\\\four-black-2-value&#39;)\" style=\"margin-left:48px;\">four-black-2</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td><td style=\"width:3px;\"></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td><td onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun5\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value\\\\three-black-2-value&#39;)\" style=\"margin-left:32px;\">three-black-2</a></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td><td style=\"width:3px;\"></td><td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t<td onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun6\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value\\\\three-black-2-value\\\\four-black-3-value&#39;)\" style=\"margin-left:48px;\">four-black-3</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td><td style=\"width:3px;\"></td><td onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun7\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-1-value\\\\three-black-2-value\\\\four-black-4-value&#39;)\" style=\"margin-left:48px;\">four-black-4</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td><td style=\"width:3px;\"></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td><td onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun8\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value&#39;)\" style=\"margin-left:16px;\">two-black-2</a></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td><td style=\"width:3px;\"></td><td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun9\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value\\\\three-black-3-value&#39;)\" style=\"margin-left:32px;\">three-black-3</a></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td><td style=\"width:3px;\"></td><td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t<td onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun10\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value\\\\three-black-3-value\\\\four-black-5-value&#39;)\" style=\"margin-left:48px;\">four-black-5</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td><td style=\"width:3px;\"></td><td onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun11\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value\\\\three-black-3-value\\\\four-black-6-value&#39;)\" style=\"margin-left:48px;\">four-black-6</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td><td style=\"width:3px;\"></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td><td onmouseover=\"Menu_HoverRoot(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun12\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value\\\\three-black-4-value&#39;)\" style=\"margin-left:32px;\">three-black-4</a></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td><td style=\"width:3px;\"></td><td><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t<td onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun13\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value\\\\three-black-4-value\\\\four-black-7-value&#39;)\" style=\"margin-left:48px;\">four-black-7</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td><td style=\"width:3px;\"></td><td onmouseover=\"Menu_HoverStatic(this)\" onmouseout=\"Menu_Unhover(this)\" onkeyup=\"Menu_Key(this)\" id=\"Menun14\"><table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">\r\n\t\t\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t\t\t<td style=\"white-space:nowrap;\"><a class=\"Menu_1\" href=\"javascript:__doPostBack(&#39;Menu&#39;,&#39;one-black-value\\\\two-black-2-value\\\\three-black-4-value\\\\four-black-8-value&#39;)\" style=\"margin-left:48px;\">four-black-8</a></td>\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t</table></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table><a id=\"Menu_SkipLink\"></a>";
-#else
-                       OriginControlHtml = @"<a href=""#Menu_SkipLink""><img alt=""Skip Navigation Links"" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><table id=""Menu"" class=""Menu_2"" cellpadding=""0"" cellspacing=""0"" border=""0"">
-       <tr>
-               <td onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun0""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                       <tr>
-                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value')"">one-black</a></td>
-                       </tr>
-               </table></td><td style=""width:3px;""></td><td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                       <tr>
-                               <td onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun1""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                       <tr>
-                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value')"" style=""margin-left:16px;"">two-black-1</a></td>
-                                       </tr>
-                               </table></td><td style=""width:3px;""></td><td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                                       <tr>
-                                               <td onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun2""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                       <tr>
-                                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value\\three-black-1-value')"" style=""margin-left:32px;"">three-black-1</a></td>
-                                                       </tr>
-                                               </table></td><td style=""width:3px;""></td><td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                                                       <tr>
-                                                               <td onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun3""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value\\three-black-1-value\\four-black-1-value')"" style=""margin-left:48px;"">four-black-1</a></td>
-                                                                       </tr>
-                                                               </table></td><td style=""width:3px;""></td><td onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun4""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value\\three-black-1-value\\four-black-2-value')"" style=""margin-left:48px;"">four-black-2</a></td>
-                                                                       </tr>
-                                                               </table></td><td style=""width:3px;""></td>
-                                                       </tr>
-                                               </table></td><td onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun5""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                       <tr>
-                                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value\\three-black-2-value')"" style=""margin-left:32px;"">three-black-2</a></td>
-                                                       </tr>
-                                               </table></td><td style=""width:3px;""></td><td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                                                       <tr>
-                                                               <td onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun6""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value\\three-black-2-value\\four-black-3-value')"" style=""margin-left:48px;"">four-black-3</a></td>
-                                                                       </tr>
-                                                               </table></td><td style=""width:3px;""></td><td onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun7""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-1-value\\three-black-2-value\\four-black-4-value')"" style=""margin-left:48px;"">four-black-4</a></td>
-                                                                       </tr>
-                                                               </table></td><td style=""width:3px;""></td>
-                                                       </tr>
-                                               </table></td>
-                                       </tr>
-                               </table></td><td onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun8""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                       <tr>
-                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value')"" style=""margin-left:16px;"">two-black-2</a></td>
-                                       </tr>
-                               </table></td><td style=""width:3px;""></td><td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                                       <tr>
-                                               <td onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun9""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                       <tr>
-                                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value\\three-black-3-value')"" style=""margin-left:32px;"">three-black-3</a></td>
-                                                       </tr>
-                                               </table></td><td style=""width:3px;""></td><td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                                                       <tr>
-                                                               <td onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun10""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value\\three-black-3-value\\four-black-5-value')"" style=""margin-left:48px;"">four-black-5</a></td>
-                                                                       </tr>
-                                                               </table></td><td style=""width:3px;""></td><td onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun11""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value\\three-black-3-value\\four-black-6-value')"" style=""margin-left:48px;"">four-black-6</a></td>
-                                                                       </tr>
-                                                               </table></td><td style=""width:3px;""></td>
-                                                       </tr>
-                                               </table></td><td onmouseover=""Menu_HoverRoot(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun12""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                       <tr>
-                                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value\\three-black-4-value')"" style=""margin-left:32px;"">three-black-4</a></td>
-                                                       </tr>
-                                               </table></td><td style=""width:3px;""></td><td><table border=""0"" cellpadding=""0"" cellspacing=""0"" width=""100%"">
-                                                       <tr>
-                                                               <td onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun13""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value\\three-black-4-value\\four-black-7-value')"" style=""margin-left:48px;"">four-black-7</a></td>
-                                                                       </tr>
-                                                               </table></td><td style=""width:3px;""></td><td onmouseover=""Menu_HoverStatic(this)"" onmouseout=""Menu_Unhover(this)"" onkeyup=""Menu_Key(this)"" id=""Menun14""><table cellpadding=""0"" cellspacing=""0"" border=""0"" width=""100%"">
-                                                                       <tr>
-                                                                               <td style=""white-space:nowrap;""><a class=""Menu_1"" href=""javascript:__doPostBack('Menu','one-black-value\\two-black-2-value\\three-black-4-value\\four-black-8-value')"" style=""margin-left:48px;"">four-black-8</a></td>
-                                                                       </tr>
-                                                               </table></td>
-                                                       </tr>
-                                               </table></td>
-                                       </tr>
-                               </table></td>
-                       </tr>
-               </table></td>
-       </tr>
-</table><a id=""Menu_SkipLink""></a>";
-#endif
                        #endregion
                        RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (Menu_RenderStaticItems_Horizontal)).Run ();
                        RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "Menu_RenderStaticItems_Horizontal");
-#if !NET_4_0 || (NET_4_0 && !DOT_NET)
+#if !DOT_NET
                        RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (Menu_RenderStaticItemsWithBaseAdapter_Horizontal)).Run ();
                        RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "Menu_RenderStaticItemsWithBaseAdapter_Horizontal");
 #endif
                }
-#if NET_4_0
                [Test]
                [Category ("NunitWeb")]
                [Ignore ("Disabled temporarily")]
@@ -1225,7 +980,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "Menu_RenderStaticItemsWithBaseAdapter_Horizontal");
 #endif
                }
-#endif
                class MyMenuAdapter : global::System.Web.UI.WebControls.Adapters.MenuAdapter
                {
                        protected internal override void RenderItem (HtmlTextWriter writer, 
@@ -1240,9 +994,7 @@ namespace MonoTests.System.Web.UI.WebControls
 
                [Test]
                [Category ("NunitWeb")]
-#if NET_4_0
                [Category ("NotDotNet")]
-#endif
                public void Menu_RenderStaticItemsWithAdapter () 
                {
                        string RenderedPageHtml, RenderedControlHtml, OriginControlHtml;
@@ -1484,7 +1236,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        m.StaticDisplayLevels = 4;
                        AddMenuToPage (p, m);
                }
-#if NET_4_0
                public static void Menu_RenderStaticItems_Vertical_List (Page p)
                {
                        Menu m = CreateMenuForRenderTests (null, false);
@@ -1503,7 +1254,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        m.RenderingMode = MenuRenderingMode.List;
                        AddMenuToPage (p, m);
                }
-#endif
                public static void Menu_RenderStaticItemsWithBaseAdapter_Vertical (Page p) {
                        Menu m = CreateMenuForRenderTests (new MyWebControl.Adapters.MenuAdapter());
                        m.StaticDisplayLevels = 4;
@@ -1560,10 +1310,8 @@ namespace MonoTests.System.Web.UI.WebControls
                static Menu CreateMenuForRenderTests (MyWebControl.Adapters.MenuAdapter adapter, bool compatibilityRendering) 
                {
                        Menu menu = new MyMenu (adapter);
-#if NET_4_0
                        if (compatibilityRendering)
                                menu.RenderingCompatibility = new Version (3, 5);
-#endif
                        menu.ID = "Menu";
                        MenuItem R, N1, N2, SN1, SN2, SN3, SN4;
                        R = new MenuItem ("one-black", "one-black-value");
@@ -1728,17 +1476,13 @@ namespace MonoTests.System.Web.UI.WebControls
                }
                [Test]
                [Category ("NunitWeb")]
-#if NET_4_0 && !DOT_NET
+#if !DOT_NET
                [Ignore ("Temporarily ignored on Mono until the Menu control is updated for 4.0")]
 #endif
                public void MenuClass ()
                {
                        string res = new WebTest ("menuclass.aspx").Run ();
-#if NET_4_0
                        string menua_pattern="<div[^>]*class=\"[^\"]*menua[^\"]*\"[^>]*>";
-#else
-                       string menua_pattern="<table[^>]*class=\"[^\"]*menua[^\"]*\"[^>]*>";
-#endif
                        Assert.IsTrue (Regex.IsMatch (res, ".*"+menua_pattern+".*",
                                RegexOptions.IgnoreCase|RegexOptions.Singleline),
                                "check that <table class=\"menua\"> is found");
@@ -1771,11 +1515,9 @@ namespace MonoTests.System.Web.UI.WebControls
 
                public static void Menu_SetTableMode (Page p)
                {
-#if NET_4_0
                        Menu m = p.Form.FindControl ("Menu1") as Menu;
                        Assert.IsNotNull (m, "Menu present");
                        m.RenderingMode = MenuRenderingMode.Table;
-#endif
                }
                
                public static void _MenuItemsPost (Page p)
@@ -2014,7 +1756,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        item.Text = null;
                        Assert.AreEqual ("VVV", item.Text, "MenuItem_TextValue2#3");
                }
-#if NET_4_0
                [Test]
                public void Menu_RenderingMode ()
                {
@@ -2041,6 +1782,5 @@ namespace MonoTests.System.Web.UI.WebControls
                                m.RenderingMode = (MenuRenderingMode) (maxValue + 1);
                        }, "#A2-2");
                }
-#endif
        }
 }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
index 05fa013c7af968fb7f1f34cc2a981356b7fb3595..9f0d0ea297249bc4f134ac76004fcd09a9e4a38a 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
@@ -422,11 +422,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        string html = new WebTest (PageInvoker.CreateOnLoad (
                                new PageDelegate (EnablePaging))).Run ();
                        string newHtml = HtmlDiff.GetControlFromPageHtml (html);
-#if NET_4_0
                        string origHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">Name</th><th scope=\"col\">Number</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Number0</td><td>0</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Number1</td><td>1</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Number2</td><td>2</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Number3</td><td>3</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Number4</td><td>4</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table>\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Page$2&#39;)\">2</a></td><td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Page$3&#39;)\">3</a></td><td><a href=\"javascript:__doPostBack(&#39;ctl01&#39;,&#39;Page$4&#39;)\">4</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string origHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">Name</th><th scope=\"col\">Number</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Number0</td><td>0</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Number1</td><td>1</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Number2</td><td>2</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Number3</td><td>3</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>Number4</td><td>4</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"2\"><table border=\"0\">\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('ctl01','Page$2')\">2</a></td><td><a href=\"javascript:__doPostBack('ctl01','Page$3')\">3</a></td><td><a href=\"javascript:__doPostBack('ctl01','Page$4')\">4</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        HtmlDiff.AssertAreEqual (origHtml, newHtml, "EnablePaging");
                }
 

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
index e6f461ffb818bccec85b19e771c5a80c06ff2fbd..7ae1839e3af5a701cb9206d0bc94d13afdd70d2f 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
@@ -504,11 +504,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (select));
                        string html = t.Run ();
-#if NET_4_0
                        string origin = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"Grid\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">ID</th><th scope=\"col\">FName</th><th scope=\"col\">LName</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>1001</td><td>Mahesh</td><td>Chand</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string origin = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"Grid\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">ID</th><th scope=\"col\">FName</th><th scope=\"col\">LName</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>1001</td><td>Mahesh</td><td>Chand</td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (html);
                        HtmlDiff.AssertAreEqual (origin, renderedHtml, "ObjectDataSourceViewSelect");
                }
@@ -552,11 +548,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        // Note : ObjectDataSource will return page counter 5 hard coded
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (selectcount));
                        string html = t.Run ();
-#if NET_4_0
                        string origin = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"Grid\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">ID</th><th scope=\"col\">FName</th><th scope=\"col\">LName</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>1001</td><td>Mahesh</td><td>Chand</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"3\"><table>\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack(&#39;Grid&#39;,&#39;Page$2&#39;)\">2</a></td><td><a href=\"javascript:__doPostBack(&#39;Grid&#39;,&#39;Page$3&#39;)\">3</a></td><td><a href=\"javascript:__doPostBack(&#39;Grid&#39;,&#39;Page$4&#39;)\">4</a></td><td><a href=\"javascript:__doPostBack(&#39;Grid&#39;,&#39;Page$5&#39;)\">5</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string origin = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"Grid\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">ID</th><th scope=\"col\">FName</th><th scope=\"col\">LName</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>1001</td><td>Mahesh</td><td>Chand</td>\r\n\t\t</tr><tr>\r\n\t\t\t<td colspan=\"3\"><table border=\"0\">\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t<td><span>1</span></td><td><a href=\"javascript:__doPostBack('Grid','Page$2')\">2</a></td><td><a href=\"javascript:__doPostBack('Grid','Page$3')\">3</a></td><td><a href=\"javascript:__doPostBack('Grid','Page$4')\">4</a></td><td><a href=\"javascript:__doPostBack('Grid','Page$5')\">5</a></td>\r\n\t\t\t\t</tr>\r\n\t\t\t</table></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (html);
                        HtmlDiff.AssertAreEqual (origin, renderedHtml, "ObjectDataSourceViewSelectCount");
                }
@@ -923,9 +915,7 @@ namespace MonoTests.System.Web.UI.WebControls
                                evaluateCount = 0;
                        }
 
-#if NET_4_0
                        internal
-#endif
                        protected override object Evaluate (HttpContext context, Control control) 
                        {
                                evaluateCount++;

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RadioButtonListTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RadioButtonListTest.cs
index c78edd26fbd3ab9137ae52c69506eeb8a622abea..75fd9a334b889ec505883783f1222d035e9d55b6 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RadioButtonListTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RadioButtonListTest.cs
@@ -180,11 +180,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                {
                        string RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (Render_Load)).Run ();
                        string RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
-#if NET_4_0
                        string OriginControlHtml = "<table id=\"ctl01\">\r\n\t<tr>\r\n\t\t<td><input id=\"ctl01_0\" type=\"radio\" name=\"ctl01\" value=\"value1\" /><label for=\"ctl01_0\">text2</label></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string OriginControlHtml = "<table id=\"ctl01\" border=\"0\">\r\n\t<tr>\r\n\t\t<td><input id=\"ctl01_0\" type=\"radio\" name=\"ctl01\" value=\"value1\" /><label for=\"ctl01_0\">text2</label></td>\r\n\t</tr>\r\n</table>";
-#endif
                        HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "Render");
                }
 

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.2.0.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.2.0.cs
index 89ac879c342baa7a97974db1e0b8727b06461a61..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.2.0.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.2.0.cs
@@ -1,14350 +0,0 @@
-#if !NET_4_0
-
-// THIS IS AUTOGENERATED DO NOT EDIT
-//
-// Authors:
-//    Ben Maurer (bmaurer@novell.com)
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Drawing;
-using System.IO;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using MonoTests.stand_alone.WebHarness;
-
-
-using NUnit.Framework;
-namespace MonoTests.System.Web.UI.WebControls {
-[TestFixture]
-public class RepeatInfo_Autogen {
-       public class RepeatInfoUser : IRepeatInfoUser {
-
-               private bool footer;
-               private bool header;
-               private bool separators;
-               private int count;
-               private int counter;
-
-
-               public RepeatInfoUser (bool header, bool footer, bool separators, int count)
-               {
-                       this.footer = footer;
-                       this.header = header;
-                       this.separators = separators;
-                       this.count = count;
-               }
-
-               static HtmlTextWriter GetWriter ()
-               {
-                       StringWriter sw = new StringWriter ();
-                       sw.NewLine = "\n";
-                       return new HtmlTextWriter (sw);
-               }
-
-               public static string DoTest (int cols, int cnt, RepeatDirection d, RepeatLayout l, bool OuterTableImplied, bool hdr, bool ftr, bool sep)
-               {
-                       HtmlTextWriter htw = GetWriter ();
-                       RepeatInfo ri = new RepeatInfo ();
-                       ri.RepeatColumns = cols;
-                       ri.RepeatDirection = d;
-                       ri.RepeatLayout = l;
-                       ri.OuterTableImplied = OuterTableImplied;
-                       Style s = new Style ();
-                       if (cols != 3)
-                               s.CssClass = "mainstyle";
-
-                       ri.RenderRepeater (htw, new RepeatInfoUser (hdr, ftr, sep, cnt), s, new DataList ());
-                       return htw.InnerWriter.ToString ();
-               }
-
-
-               public bool HasFooter {
-                       get { return footer; }
-               }
-
-               public bool HasHeader {
-                       get { return header; }
-               }
-               
-               public bool HasSeparators {
-                       get { return separators; }
-               }
-
-               public int RepeatedItemCount {
-                       get { return count; }
-               }
-
-               public Style GetItemStyle (ListItemType itemType, int repeatIndex)
-               {
-                       Style s = new Style ();
-                       s.CssClass = String.Format ("{0}{1}", itemType, repeatIndex);
-                       return s;
-               }
-
-               public void RenderItem (ListItemType itemType, int repeatIndex, RepeatInfo repeatInfo, HtmlTextWriter writer)
-               {
-                       writer.Write ("({0},{1},{2})", counter++, itemType, repeatIndex);
-               }
-       }
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""0"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td colspan=""0"" class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-        
-        HtmlDiff.AssertAreEqual(exp, v, "#0");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(2,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#1");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(4,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#2");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""10"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td><td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td><td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td><td class=""Item4"">(9,Item,4)</td><td></td>
-       </tr><tr>
-               <td colspan=""10"" class=""Footer-1"">(10,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#3");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#4");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(9,Item,4)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(10,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#5");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td><td class=""Item3"">(7,Item,3)</td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(8,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#6");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td><td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item5"">(11,Item,5)</td><td class=""Separator5"">(12,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(13,Item,6)</td><td></td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(14,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#7");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""6"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td><td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td><td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item5"">(11,Item,5)</td><td class=""Separator5"">(12,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(13,Item,6)</td><td class=""Separator6"">(14,Separator,6)</td><td class=""Item7"">(15,Item,7)</td><td class=""Separator7"">(16,Separator,7)</td><td class=""Item8"">(17,Item,8)</td><td></td>
-       </tr><tr>
-               <td colspan=""6"" class=""Footer-1"">(18,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#8");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""6"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td><td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td><td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item5"">(11,Item,5)</td><td class=""Separator5"">(12,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(13,Item,6)</td><td></td><td></td><td></td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""6"" class=""Footer-1"">(14,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#9");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#10");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#11");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#12");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)(9,Item,4)(10,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#13");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#14");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)(9,Item,4)(10,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#15");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,2)(4,Separator,2)(5,Item,1)(6,Separator,1)(7,Item,3)(8,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#16");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,4)(4,Separator,4)(5,Item,1)(6,Separator,1)(7,Item,5)(8,Separator,5)(9,Item,2)(10,Separator,2)(11,Item,6)(12,Item,3)(13,Separator,3)(14,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#17");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,3)(4,Separator,3)(5,Item,6)(6,Separator,6)(7,Item,1)(8,Separator,1)(9,Item,4)(10,Separator,4)(11,Item,7)(12,Separator,7)(13,Item,2)(14,Separator,2)(15,Item,5)(16,Separator,5)(17,Item,8)(18,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#18");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,3)(4,Separator,3)(5,Item,5)(6,Separator,5)(7,Item,1)(8,Separator,1)(9,Item,4)(10,Separator,4)(11,Item,6)(12,Item,2)(13,Separator,2)(14,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#19");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#20");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#21");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#22");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)(9,Item,4)(10,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#23");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#24");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)<br />(3,Item,1)(4,Separator,1)<br />(5,Item,2)(6,Separator,2)<br />(7,Item,3)(8,Separator,3)<br />(9,Item,4)<br />(10,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#25");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)<br />(5,Item,2)(6,Separator,2)(7,Item,3)<br />(8,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#26");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)<br />(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)<br />(9,Item,4)(10,Separator,4)(11,Item,5)(12,Separator,5)<br />(13,Item,6)<br />(14,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#27");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)<br />(7,Item,3)(8,Separator,3)(9,Item,4)(10,Separator,4)(11,Item,5)(12,Separator,5)<br />(13,Item,6)(14,Separator,6)(15,Item,7)(16,Separator,7)(17,Item,8)<br />(18,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#28");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)<br />(7,Item,3)(8,Separator,3)(9,Item,4)(10,Separator,4)(11,Item,5)(12,Separator,5)<br />(13,Item,6)<br />(14,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#29");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#30");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#31");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#32");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)(9,Item,4)(10,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#33");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#34");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)(9,Item,4)(10,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#35");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,2)(4,Separator,2)(5,Item,1)(6,Separator,1)(7,Item,3)(8,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#36");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,4)(4,Separator,4)(5,Item,1)(6,Separator,1)(7,Item,5)(8,Separator,5)(9,Item,2)(10,Separator,2)(11,Item,6)(12,Item,3)(13,Separator,3)(14,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#37");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,3)(4,Separator,3)(5,Item,6)(6,Separator,6)(7,Item,1)(8,Separator,1)(9,Item,4)(10,Separator,4)(11,Item,7)(12,Separator,7)(13,Item,2)(14,Separator,2)(15,Item,5)(16,Separator,5)(17,Item,8)(18,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#38");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_otrtblimp_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,3)(4,Separator,3)(5,Item,5)(6,Separator,5)(7,Item,1)(8,Separator,1)(9,Item,4)(10,Separator,4)(11,Item,6)(12,Item,2)(13,Separator,2)(14,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#39");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""0"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td colspan=""0"" class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#40");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(2,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#41");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(4,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#42");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""10"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td><td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td><td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td><td class=""Item4"">(9,Item,4)</td><td></td>
-       </tr><tr>
-               <td colspan=""10"" class=""Footer-1"">(10,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#43");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#44");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(9,Item,4)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(10,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#45");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td><td class=""Item3"">(7,Item,3)</td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(8,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#46");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td><td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item5"">(11,Item,5)</td><td class=""Separator5"">(12,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(13,Item,6)</td><td></td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(14,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#47");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""6"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td><td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td><td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item5"">(11,Item,5)</td><td class=""Separator5"">(12,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(13,Item,6)</td><td class=""Separator6"">(14,Separator,6)</td><td class=""Item7"">(15,Item,7)</td><td class=""Separator7"">(16,Separator,7)</td><td class=""Item8"">(17,Item,8)</td><td></td>
-       </tr><tr>
-               <td colspan=""6"" class=""Footer-1"">(18,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#48");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""6"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td><td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td><td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item5"">(11,Item,5)</td><td class=""Separator5"">(12,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(13,Item,6)</td><td></td><td></td><td></td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""6"" class=""Footer-1"">(14,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#49");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#50");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(2,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#51");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Separator0"">(2,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(4,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#52");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Separator0"">(2,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td>
-       </tr><tr>
-               <td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td>
-       </tr><tr>
-               <td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td>
-       </tr><tr>
-               <td class=""Separator3"">(8,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(9,Item,4)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(10,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#53");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#54");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Separator0"">(2,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td>
-       </tr><tr>
-               <td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td>
-       </tr><tr>
-               <td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td>
-       </tr><tr>
-               <td class=""Separator3"">(8,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(9,Item,4)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(10,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#55");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item2"">(3,Item,2)</td><td class=""Separator2"">(4,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item1"">(5,Item,1)</td><td class=""Separator1"">(6,Separator,1)</td><td class=""Item3"">(7,Item,3)</td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(8,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#56");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item4"">(3,Item,4)</td><td class=""Separator4"">(4,Separator,4)</td>
-       </tr><tr>
-               <td class=""Item1"">(5,Item,1)</td><td class=""Separator1"">(6,Separator,1)</td><td class=""Item5"">(7,Item,5)</td><td class=""Separator5"">(8,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item2"">(9,Item,2)</td><td class=""Separator2"">(10,Separator,2)</td><td class=""Item6"">(11,Item,6)</td><td></td>
-       </tr><tr>
-               <td class=""Item3"">(12,Item,3)</td><td class=""Separator3"">(13,Separator,3)</td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(14,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#57");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""6"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item3"">(3,Item,3)</td><td class=""Separator3"">(4,Separator,3)</td><td class=""Item6"">(5,Item,6)</td><td class=""Separator6"">(6,Separator,6)</td>
-       </tr><tr>
-               <td class=""Item1"">(7,Item,1)</td><td class=""Separator1"">(8,Separator,1)</td><td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item7"">(11,Item,7)</td><td class=""Separator7"">(12,Separator,7)</td>
-       </tr><tr>
-               <td class=""Item2"">(13,Item,2)</td><td class=""Separator2"">(14,Separator,2)</td><td class=""Item5"">(15,Item,5)</td><td class=""Separator5"">(16,Separator,5)</td><td class=""Item8"">(17,Item,8)</td><td></td>
-       </tr><tr>
-               <td colspan=""6"" class=""Footer-1"">(18,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#58");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""6"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item3"">(3,Item,3)</td><td class=""Separator3"">(4,Separator,3)</td><td class=""Item5"">(5,Item,5)</td><td class=""Separator5"">(6,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item1"">(7,Item,1)</td><td class=""Separator1"">(8,Separator,1)</td><td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item6"">(11,Item,6)</td><td></td>
-       </tr><tr>
-               <td class=""Item2"">(12,Item,2)</td><td class=""Separator2"">(13,Separator,2)</td><td></td><td></td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""6"" class=""Footer-1"">(14,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#59");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#60");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#61");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#62");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)(9,Item,4)(10,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#63");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#64");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)<br />(3,Item,1)(4,Separator,1)<br />(5,Item,2)(6,Separator,2)<br />(7,Item,3)(8,Separator,3)<br />(9,Item,4)<br />(10,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#65");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)<br />(5,Item,2)(6,Separator,2)(7,Item,3)<br />(8,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#66");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)<br />(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)<br />(9,Item,4)(10,Separator,4)(11,Item,5)(12,Separator,5)<br />(13,Item,6)<br />(14,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#67");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)<br />(7,Item,3)(8,Separator,3)(9,Item,4)(10,Separator,4)(11,Item,5)(12,Separator,5)<br />(13,Item,6)(14,Separator,6)(15,Item,7)(16,Separator,7)(17,Item,8)<br />(18,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#68");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)<br />(7,Item,3)(8,Separator,3)(9,Item,4)(10,Separator,4)(11,Item,5)(12,Separator,5)<br />(13,Item,6)<br />(14,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#69");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#70");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#71");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Separator,0)<br />(3,Item,1)<br />(4,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#72");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_hdr_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Separator,0)<br />(3,Item,1)<br />(4,Separator,1)<br />(5,Item,2)<br />(6,Separator,2)<br />(7,Item,3)<br />(8,Separator,3)<br />(9,Item,4)<br />(10,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#73");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#74");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_hdr_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Separator,0)<br />(3,Item,1)<br />(4,Separator,1)<br />(5,Item,2)<br />(6,Separator,2)<br />(7,Item,3)<br />(8,Separator,3)<br />(9,Item,4)<br />(10,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#75");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,2)(4,Separator,2)<br />(5,Item,1)(6,Separator,1)(7,Item,3)<br />(8,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#76");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_hdr_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,4)(4,Separator,4)<br />(5,Item,1)(6,Separator,1)(7,Item,5)(8,Separator,5)<br />(9,Item,2)(10,Separator,2)(11,Item,6)<br />(12,Item,3)(13,Separator,3)<br />(14,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#77");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,3)(4,Separator,3)(5,Item,6)(6,Separator,6)<br />(7,Item,1)(8,Separator,1)(9,Item,4)(10,Separator,4)(11,Item,7)(12,Separator,7)<br />(13,Item,2)(14,Separator,2)(15,Item,5)(16,Separator,5)(17,Item,8)<br />(18,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#78");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_hdr_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, true);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,3)(4,Separator,3)(5,Item,5)(6,Separator,5)<br />(7,Item,1)(8,Separator,1)(9,Item,4)(10,Separator,4)(11,Item,6)<br />(12,Item,2)(13,Separator,2)<br />(14,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#79");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""0"" class=""Footer-1"">(0,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#80");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#81");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(3,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#82");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td><td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td><td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td><td class=""Item4"">(8,Item,4)</td><td></td>
-       </tr><tr>
-               <td colspan=""10"" class=""Footer-1"">(9,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#83");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Footer-1"">(0,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#84");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(8,Item,4)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(9,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#85");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td><td class=""Item3"">(6,Item,3)</td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(7,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#86");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td><td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item5"">(10,Item,5)</td><td class=""Separator5"">(11,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(12,Item,6)</td><td></td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(13,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#87");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td><td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td><td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item5"">(10,Item,5)</td><td class=""Separator5"">(11,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(12,Item,6)</td><td class=""Separator6"">(13,Separator,6)</td><td class=""Item7"">(14,Item,7)</td><td class=""Separator7"">(15,Separator,7)</td><td class=""Item8"">(16,Item,8)</td><td></td>
-       </tr><tr>
-               <td colspan=""6"" class=""Footer-1"">(17,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#88");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td><td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td><td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item5"">(10,Item,5)</td><td class=""Separator5"">(11,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(12,Item,6)</td><td></td><td></td><td></td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""6"" class=""Footer-1"">(13,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#89");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, true);
-               string exp = @"(0,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#90");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#91");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,1)(3,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#92");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)(8,Item,4)(9,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#93");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, true);
-               string exp = @"(0,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#94");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)(8,Item,4)(9,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#95");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,2)(3,Separator,2)(4,Item,1)(5,Separator,1)(6,Item,3)(7,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#96");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,4)(3,Separator,4)(4,Item,1)(5,Separator,1)(6,Item,5)(7,Separator,5)(8,Item,2)(9,Separator,2)(10,Item,6)(11,Item,3)(12,Separator,3)(13,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#97");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,3)(3,Separator,3)(4,Item,6)(5,Separator,6)(6,Item,1)(7,Separator,1)(8,Item,4)(9,Separator,4)(10,Item,7)(11,Separator,7)(12,Item,2)(13,Separator,2)(14,Item,5)(15,Separator,5)(16,Item,8)(17,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#98");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_otrtblimp_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,3)(3,Separator,3)(4,Item,5)(5,Separator,5)(6,Item,1)(7,Separator,1)(8,Item,4)(9,Separator,4)(10,Item,6)(11,Item,2)(12,Separator,2)(13,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#99");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#100");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#101");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#102");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)(8,Item,4)(9,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#103");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#104");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)<br />(2,Item,1)(3,Separator,1)<br />(4,Item,2)(5,Separator,2)<br />(6,Item,3)(7,Separator,3)<br />(8,Item,4)<br />(9,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#105");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)<br />(4,Item,2)(5,Separator,2)(6,Item,3)<br />(7,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#106");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)<br />(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)<br />(8,Item,4)(9,Separator,4)(10,Item,5)(11,Separator,5)<br />(12,Item,6)<br />(13,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#107");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"<span>(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)<br />(6,Item,3)(7,Separator,3)(8,Item,4)(9,Separator,4)(10,Item,5)(11,Separator,5)<br />(12,Item,6)(13,Separator,6)(14,Item,7)(15,Separator,7)(16,Item,8)<br />(17,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#108");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"<span>(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)<br />(6,Item,3)(7,Separator,3)(8,Item,4)(9,Separator,4)(10,Item,5)(11,Separator,5)<br />(12,Item,6)<br />(13,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#109");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"(0,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#110");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#111");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,1)(3,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#112");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)(8,Item,4)(9,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#113");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"(0,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#114");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)(8,Item,4)(9,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#115");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,2)(3,Separator,2)(4,Item,1)(5,Separator,1)(6,Item,3)(7,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#116");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,4)(3,Separator,4)(4,Item,1)(5,Separator,1)(6,Item,5)(7,Separator,5)(8,Item,2)(9,Separator,2)(10,Item,6)(11,Item,3)(12,Separator,3)(13,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#117");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,3)(3,Separator,3)(4,Item,6)(5,Separator,6)(6,Item,1)(7,Separator,1)(8,Item,4)(9,Separator,4)(10,Item,7)(11,Separator,7)(12,Item,2)(13,Separator,2)(14,Item,5)(15,Separator,5)(16,Item,8)(17,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#118");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_otrtblimp_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,3)(3,Separator,3)(4,Item,5)(5,Separator,5)(6,Item,1)(7,Separator,1)(8,Item,4)(9,Separator,4)(10,Item,6)(11,Item,2)(12,Separator,2)(13,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#119");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""0"" class=""Footer-1"">(0,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#120");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#121");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(3,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#122");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td><td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td><td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td><td class=""Item4"">(8,Item,4)</td><td></td>
-       </tr><tr>
-               <td colspan=""10"" class=""Footer-1"">(9,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#123");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Footer-1"">(0,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#124");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(8,Item,4)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(9,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#125");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td><td class=""Item3"">(6,Item,3)</td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(7,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#126");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td><td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item5"">(10,Item,5)</td><td class=""Separator5"">(11,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(12,Item,6)</td><td></td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(13,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#127");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td><td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td><td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item5"">(10,Item,5)</td><td class=""Separator5"">(11,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(12,Item,6)</td><td class=""Separator6"">(13,Separator,6)</td><td class=""Item7"">(14,Item,7)</td><td class=""Separator7"">(15,Separator,7)</td><td class=""Item8"">(16,Item,8)</td><td></td>
-       </tr><tr>
-               <td colspan=""6"" class=""Footer-1"">(17,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#128");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td><td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td><td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item5"">(10,Item,5)</td><td class=""Separator5"">(11,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(12,Item,6)</td><td></td><td></td><td></td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""6"" class=""Footer-1"">(13,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#129");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Footer-1"">(0,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#130");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#131");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Separator0"">(1,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(3,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#132");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Separator0"">(1,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td>
-       </tr><tr>
-               <td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td>
-       </tr><tr>
-               <td class=""Separator3"">(7,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(8,Item,4)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(9,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#133");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Footer-1"">(0,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#134");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Separator0"">(1,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td>
-       </tr><tr>
-               <td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td>
-       </tr><tr>
-               <td class=""Separator3"">(7,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(8,Item,4)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(9,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#135");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item2"">(2,Item,2)</td><td class=""Separator2"">(3,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item1"">(4,Item,1)</td><td class=""Separator1"">(5,Separator,1)</td><td class=""Item3"">(6,Item,3)</td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(7,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#136");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item4"">(2,Item,4)</td><td class=""Separator4"">(3,Separator,4)</td>
-       </tr><tr>
-               <td class=""Item1"">(4,Item,1)</td><td class=""Separator1"">(5,Separator,1)</td><td class=""Item5"">(6,Item,5)</td><td class=""Separator5"">(7,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item2"">(8,Item,2)</td><td class=""Separator2"">(9,Separator,2)</td><td class=""Item6"">(10,Item,6)</td><td></td>
-       </tr><tr>
-               <td class=""Item3"">(11,Item,3)</td><td class=""Separator3"">(12,Separator,3)</td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""4"" class=""Footer-1"">(13,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#137");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item3"">(2,Item,3)</td><td class=""Separator3"">(3,Separator,3)</td><td class=""Item6"">(4,Item,6)</td><td class=""Separator6"">(5,Separator,6)</td>
-       </tr><tr>
-               <td class=""Item1"">(6,Item,1)</td><td class=""Separator1"">(7,Separator,1)</td><td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item7"">(10,Item,7)</td><td class=""Separator7"">(11,Separator,7)</td>
-       </tr><tr>
-               <td class=""Item2"">(12,Item,2)</td><td class=""Separator2"">(13,Separator,2)</td><td class=""Item5"">(14,Item,5)</td><td class=""Separator5"">(15,Separator,5)</td><td class=""Item8"">(16,Item,8)</td><td></td>
-       </tr><tr>
-               <td colspan=""6"" class=""Footer-1"">(17,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#138");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item3"">(2,Item,3)</td><td class=""Separator3"">(3,Separator,3)</td><td class=""Item5"">(4,Item,5)</td><td class=""Separator5"">(5,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item1"">(6,Item,1)</td><td class=""Separator1"">(7,Separator,1)</td><td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item6"">(10,Item,6)</td><td></td>
-       </tr><tr>
-               <td class=""Item2"">(11,Item,2)</td><td class=""Separator2"">(12,Separator,2)</td><td></td><td></td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""6"" class=""Footer-1"">(13,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#139");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#140");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#141");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#142");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)(8,Item,4)(9,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#143");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#144");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)<br />(2,Item,1)(3,Separator,1)<br />(4,Item,2)(5,Separator,2)<br />(6,Item,3)(7,Separator,3)<br />(8,Item,4)<br />(9,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#145");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)<br />(4,Item,2)(5,Separator,2)(6,Item,3)<br />(7,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#146");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)<br />(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)<br />(8,Item,4)(9,Separator,4)(10,Item,5)(11,Separator,5)<br />(12,Item,6)<br />(13,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#147");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span>(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)<br />(6,Item,3)(7,Separator,3)(8,Item,4)(9,Separator,4)(10,Item,5)(11,Separator,5)<br />(12,Item,6)(13,Separator,6)(14,Item,7)(15,Separator,7)(16,Item,8)<br />(17,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#148");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span>(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)<br />(6,Item,3)(7,Separator,3)(8,Item,4)(9,Separator,4)(10,Item,5)(11,Separator,5)<br />(12,Item,6)<br />(13,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#149");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#150");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#151");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Separator,0)<br />(2,Item,1)<br />(3,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#152");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_ftr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Separator,0)<br />(2,Item,1)<br />(3,Separator,1)<br />(4,Item,2)<br />(5,Separator,2)<br />(6,Item,3)<br />(7,Separator,3)<br />(8,Item,4)<br />(9,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#153");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#154");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_ftr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Separator,0)<br />(2,Item,1)<br />(3,Separator,1)<br />(4,Item,2)<br />(5,Separator,2)<br />(6,Item,3)<br />(7,Separator,3)<br />(8,Item,4)<br />(9,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#155");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,2)(3,Separator,2)<br />(4,Item,1)(5,Separator,1)(6,Item,3)<br />(7,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#156");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_ftr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,4)(3,Separator,4)<br />(4,Item,1)(5,Separator,1)(6,Item,5)(7,Separator,5)<br />(8,Item,2)(9,Separator,2)(10,Item,6)<br />(11,Item,3)(12,Separator,3)<br />(13,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#157");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span>(0,Item,0)(1,Separator,0)(2,Item,3)(3,Separator,3)(4,Item,6)(5,Separator,6)<br />(6,Item,1)(7,Separator,1)(8,Item,4)(9,Separator,4)(10,Item,7)(11,Separator,7)<br />(12,Item,2)(13,Separator,2)(14,Item,5)(15,Separator,5)(16,Item,8)<br />(17,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#158");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_ftr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, true);
-               string exp = @"<span>(0,Item,0)(1,Separator,0)(2,Item,3)(3,Separator,3)(4,Item,5)(5,Separator,5)<br />(6,Item,1)(7,Separator,1)(8,Item,4)(9,Separator,4)(10,Item,6)<br />(11,Item,2)(12,Separator,2)<br />(13,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#159");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""0"" class=""Header-1"">(0,Header,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#160");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#161");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#162");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""10"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td><td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td><td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td><td class=""Item4"">(9,Item,4)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#163");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#164");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(9,Item,4)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#165");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td><td class=""Item3"">(7,Item,3)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#166");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td><td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item5"">(11,Item,5)</td><td class=""Separator5"">(12,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(13,Item,6)</td><td></td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#167");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""6"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td><td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td><td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item5"">(11,Item,5)</td><td class=""Separator5"">(12,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(13,Item,6)</td><td class=""Separator6"">(14,Separator,6)</td><td class=""Item7"">(15,Item,7)</td><td class=""Separator7"">(16,Separator,7)</td><td class=""Item8"">(17,Item,8)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#168");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""6"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td><td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td><td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item5"">(11,Item,5)</td><td class=""Separator5"">(12,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(13,Item,6)</td><td></td><td></td><td></td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#169");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, true);
-               string exp = @"(0,Header,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#170");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)";
-               HtmlDiff.AssertAreEqual (exp, v, "#171");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#172");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)(9,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#173");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, true);
-               string exp = @"(0,Header,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#174");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)(9,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#175");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,2)(4,Separator,2)(5,Item,1)(6,Separator,1)(7,Item,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#176");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,4)(4,Separator,4)(5,Item,1)(6,Separator,1)(7,Item,5)(8,Separator,5)(9,Item,2)(10,Separator,2)(11,Item,6)(12,Item,3)(13,Separator,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#177");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,3)(4,Separator,3)(5,Item,6)(6,Separator,6)(7,Item,1)(8,Separator,1)(9,Item,4)(10,Separator,4)(11,Item,7)(12,Separator,7)(13,Item,2)(14,Separator,2)(15,Item,5)(16,Separator,5)(17,Item,8)";
-               HtmlDiff.AssertAreEqual (exp, v, "#178");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_otrtblimp_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,3)(4,Separator,3)(5,Item,5)(6,Separator,5)(7,Item,1)(8,Separator,1)(9,Item,4)(10,Separator,4)(11,Item,6)(12,Item,2)(13,Separator,2)";
-               HtmlDiff.AssertAreEqual (exp, v, "#179");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#180");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#181");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#182");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)(9,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#183");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#184");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)<br />(3,Item,1)(4,Separator,1)<br />(5,Item,2)(6,Separator,2)<br />(7,Item,3)(8,Separator,3)<br />(9,Item,4)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#185");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)<br />(5,Item,2)(6,Separator,2)(7,Item,3)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#186");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)<br />(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)<br />(9,Item,4)(10,Separator,4)(11,Item,5)(12,Separator,5)<br />(13,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#187");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)<br />(7,Item,3)(8,Separator,3)(9,Item,4)(10,Separator,4)(11,Item,5)(12,Separator,5)<br />(13,Item,6)(14,Separator,6)(15,Item,7)(16,Separator,7)(17,Item,8)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#188");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)<br />(7,Item,3)(8,Separator,3)(9,Item,4)(10,Separator,4)(11,Item,5)(12,Separator,5)<br />(13,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#189");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"(0,Header,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#190");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)";
-               HtmlDiff.AssertAreEqual (exp, v, "#191");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#192");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)(9,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#193");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"(0,Header,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#194");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)(9,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#195");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,2)(4,Separator,2)(5,Item,1)(6,Separator,1)(7,Item,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#196");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,4)(4,Separator,4)(5,Item,1)(6,Separator,1)(7,Item,5)(8,Separator,5)(9,Item,2)(10,Separator,2)(11,Item,6)(12,Item,3)(13,Separator,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#197");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,3)(4,Separator,3)(5,Item,6)(6,Separator,6)(7,Item,1)(8,Separator,1)(9,Item,4)(10,Separator,4)(11,Item,7)(12,Separator,7)(13,Item,2)(14,Separator,2)(15,Item,5)(16,Separator,5)(17,Item,8)";
-               HtmlDiff.AssertAreEqual (exp, v, "#198");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_otrtblimp_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, true);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,3)(4,Separator,3)(5,Item,5)(6,Separator,5)(7,Item,1)(8,Separator,1)(9,Item,4)(10,Separator,4)(11,Item,6)(12,Item,2)(13,Separator,2)";
-               HtmlDiff.AssertAreEqual (exp, v, "#199");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""0"" class=""Header-1"">(0,Header,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#200");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#201");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#202");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""10"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td><td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td><td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td><td class=""Item4"">(9,Item,4)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#203");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#204");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(9,Item,4)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#205");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td><td class=""Item3"">(7,Item,3)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#206");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td><td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item5"">(11,Item,5)</td><td class=""Separator5"">(12,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(13,Item,6)</td><td></td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#207");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""6"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td><td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td><td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item5"">(11,Item,5)</td><td class=""Separator5"">(12,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(13,Item,6)</td><td class=""Separator6"">(14,Separator,6)</td><td class=""Item7"">(15,Item,7)</td><td class=""Separator7"">(16,Separator,7)</td><td class=""Item8"">(17,Item,8)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#208");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""6"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item1"">(3,Item,1)</td><td class=""Separator1"">(4,Separator,1)</td><td class=""Item2"">(5,Item,2)</td><td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td class=""Separator3"">(8,Separator,3)</td><td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item5"">(11,Item,5)</td><td class=""Separator5"">(12,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(13,Item,6)</td><td></td><td></td><td></td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#209");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#210");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#211");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Separator0"">(2,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#212");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Separator0"">(2,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td>
-       </tr><tr>
-               <td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td>
-       </tr><tr>
-               <td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td>
-       </tr><tr>
-               <td class=""Separator3"">(8,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(9,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#213");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#214");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Separator0"">(2,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td>
-       </tr><tr>
-               <td class=""Separator1"">(4,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td>
-       </tr><tr>
-               <td class=""Separator2"">(6,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td>
-       </tr><tr>
-               <td class=""Separator3"">(8,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(9,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#215");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item2"">(3,Item,2)</td><td class=""Separator2"">(4,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item1"">(5,Item,1)</td><td class=""Separator1"">(6,Separator,1)</td><td class=""Item3"">(7,Item,3)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#216");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""4"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item4"">(3,Item,4)</td><td class=""Separator4"">(4,Separator,4)</td>
-       </tr><tr>
-               <td class=""Item1"">(5,Item,1)</td><td class=""Separator1"">(6,Separator,1)</td><td class=""Item5"">(7,Item,5)</td><td class=""Separator5"">(8,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item2"">(9,Item,2)</td><td class=""Separator2"">(10,Separator,2)</td><td class=""Item6"">(11,Item,6)</td><td></td>
-       </tr><tr>
-               <td class=""Item3"">(12,Item,3)</td><td class=""Separator3"">(13,Separator,3)</td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#217");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""6"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item3"">(3,Item,3)</td><td class=""Separator3"">(4,Separator,3)</td><td class=""Item6"">(5,Item,6)</td><td class=""Separator6"">(6,Separator,6)</td>
-       </tr><tr>
-               <td class=""Item1"">(7,Item,1)</td><td class=""Separator1"">(8,Separator,1)</td><td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item7"">(11,Item,7)</td><td class=""Separator7"">(12,Separator,7)</td>
-       </tr><tr>
-               <td class=""Item2"">(13,Item,2)</td><td class=""Separator2"">(14,Separator,2)</td><td class=""Item5"">(15,Item,5)</td><td class=""Separator5"">(16,Separator,5)</td><td class=""Item8"">(17,Item,8)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#218");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""6"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Separator0"">(2,Separator,0)</td><td class=""Item3"">(3,Item,3)</td><td class=""Separator3"">(4,Separator,3)</td><td class=""Item5"">(5,Item,5)</td><td class=""Separator5"">(6,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item1"">(7,Item,1)</td><td class=""Separator1"">(8,Separator,1)</td><td class=""Item4"">(9,Item,4)</td><td class=""Separator4"">(10,Separator,4)</td><td class=""Item6"">(11,Item,6)</td><td></td>
-       </tr><tr>
-               <td class=""Item2"">(12,Item,2)</td><td class=""Separator2"">(13,Separator,2)</td><td></td><td></td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#219");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#220");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#221");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#222");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)(9,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#223");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#224");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)<br />(3,Item,1)(4,Separator,1)<br />(5,Item,2)(6,Separator,2)<br />(7,Item,3)(8,Separator,3)<br />(9,Item,4)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#225");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)<br />(5,Item,2)(6,Separator,2)(7,Item,3)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#226");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)<br />(5,Item,2)(6,Separator,2)(7,Item,3)(8,Separator,3)<br />(9,Item,4)(10,Separator,4)(11,Item,5)(12,Separator,5)<br />(13,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#227");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)<br />(7,Item,3)(8,Separator,3)(9,Item,4)(10,Separator,4)(11,Item,5)(12,Separator,5)<br />(13,Item,6)(14,Separator,6)(15,Item,7)(16,Separator,7)(17,Item,8)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#228");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,1)(4,Separator,1)(5,Item,2)(6,Separator,2)<br />(7,Item,3)(8,Separator,3)(9,Item,4)(10,Separator,4)(11,Item,5)(12,Separator,5)<br />(13,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#229");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#230");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#231");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Separator,0)<br />(3,Item,1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#232");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_hdr_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Separator,0)<br />(3,Item,1)<br />(4,Separator,1)<br />(5,Item,2)<br />(6,Separator,2)<br />(7,Item,3)<br />(8,Separator,3)<br />(9,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#233");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#234");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_hdr_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Separator,0)<br />(3,Item,1)<br />(4,Separator,1)<br />(5,Item,2)<br />(6,Separator,2)<br />(7,Item,3)<br />(8,Separator,3)<br />(9,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#235");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,2)(4,Separator,2)<br />(5,Item,1)(6,Separator,1)(7,Item,3)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#236");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_hdr_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,4)(4,Separator,4)<br />(5,Item,1)(6,Separator,1)(7,Item,5)(8,Separator,5)<br />(9,Item,2)(10,Separator,2)(11,Item,6)<br />(12,Item,3)(13,Separator,3)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#237");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,3)(4,Separator,3)(5,Item,6)(6,Separator,6)<br />(7,Item,1)(8,Separator,1)(9,Item,4)(10,Separator,4)(11,Item,7)(12,Separator,7)<br />(13,Item,2)(14,Separator,2)(15,Item,5)(16,Separator,5)(17,Item,8)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#238");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_hdr_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, true);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Separator,0)(3,Item,3)(4,Separator,3)(5,Item,5)(6,Separator,5)<br />(7,Item,1)(8,Separator,1)(9,Item,4)(10,Separator,4)(11,Item,6)<br />(12,Item,2)(13,Separator,2)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#239");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#240");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#241");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#242");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td><td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td><td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td><td class=""Item4"">(8,Item,4)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#243");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_otrtblimp_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#244");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_otrtblimp_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(8,Item,4)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#245");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_otrtblimp_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td><td class=""Item3"">(6,Item,3)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#246");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_otrtblimp_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td><td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item5"">(10,Item,5)</td><td class=""Separator5"">(11,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(12,Item,6)</td><td></td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#247");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_otrtblimp_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td><td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td><td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item5"">(10,Item,5)</td><td class=""Separator5"">(11,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(12,Item,6)</td><td class=""Separator6"">(13,Separator,6)</td><td class=""Item7"">(14,Item,7)</td><td class=""Separator7"">(15,Separator,7)</td><td class=""Item8"">(16,Item,8)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#248");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_otrtblimp_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td><td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td><td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item5"">(10,Item,5)</td><td class=""Separator5"">(11,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(12,Item,6)</td><td></td><td></td><td></td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#249");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, true);
-               string exp = @"";
-               HtmlDiff.AssertAreEqual (exp, v, "#250");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, true);
-               string exp = @"(0,Item,0)";
-               HtmlDiff.AssertAreEqual (exp, v, "#251");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#252");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)(8,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#253");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_otrtblimp_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, true);
-               string exp = @"";
-               HtmlDiff.AssertAreEqual (exp, v, "#254");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_otrtblimp_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)(8,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#255");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_otrtblimp_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,2)(3,Separator,2)(4,Item,1)(5,Separator,1)(6,Item,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#256");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_otrtblimp_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,4)(3,Separator,4)(4,Item,1)(5,Separator,1)(6,Item,5)(7,Separator,5)(8,Item,2)(9,Separator,2)(10,Item,6)(11,Item,3)(12,Separator,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#257");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_otrtblimp_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,3)(3,Separator,3)(4,Item,6)(5,Separator,6)(6,Item,1)(7,Separator,1)(8,Item,4)(9,Separator,4)(10,Item,7)(11,Separator,7)(12,Item,2)(13,Separator,2)(14,Item,5)(15,Separator,5)(16,Item,8)";
-               HtmlDiff.AssertAreEqual (exp, v, "#258");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_otrtblimp_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,3)(3,Separator,3)(4,Item,5)(5,Separator,5)(6,Item,1)(7,Separator,1)(8,Item,4)(9,Separator,4)(10,Item,6)(11,Item,2)(12,Separator,2)";
-               HtmlDiff.AssertAreEqual (exp, v, "#259");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"<span class=""mainstyle""></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#260");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#261");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#262");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)(8,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#263");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_otrtblimp_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"<span class=""mainstyle""></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#264");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_otrtblimp_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)<br />(2,Item,1)(3,Separator,1)<br />(4,Item,2)(5,Separator,2)<br />(6,Item,3)(7,Separator,3)<br />(8,Item,4)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#265");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_otrtblimp_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)<br />(4,Item,2)(5,Separator,2)(6,Item,3)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#266");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_otrtblimp_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)<br />(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)<br />(8,Item,4)(9,Separator,4)(10,Item,5)(11,Separator,5)<br />(12,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#267");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_otrtblimp_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"<span>(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)<br />(6,Item,3)(7,Separator,3)(8,Item,4)(9,Separator,4)(10,Item,5)(11,Separator,5)<br />(12,Item,6)(13,Separator,6)(14,Item,7)(15,Separator,7)(16,Item,8)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#268");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_otrtblimp_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"<span>(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)<br />(6,Item,3)(7,Separator,3)(8,Item,4)(9,Separator,4)(10,Item,5)(11,Separator,5)<br />(12,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#269");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"";
-               HtmlDiff.AssertAreEqual (exp, v, "#270");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"(0,Item,0)";
-               HtmlDiff.AssertAreEqual (exp, v, "#271");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#272");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_otrtblimp_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)(8,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#273");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_otrtblimp_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"";
-               HtmlDiff.AssertAreEqual (exp, v, "#274");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_otrtblimp_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)(8,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#275");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_otrtblimp_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,2)(3,Separator,2)(4,Item,1)(5,Separator,1)(6,Item,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#276");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_otrtblimp_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,4)(3,Separator,4)(4,Item,1)(5,Separator,1)(6,Item,5)(7,Separator,5)(8,Item,2)(9,Separator,2)(10,Item,6)(11,Item,3)(12,Separator,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#277");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_otrtblimp_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,3)(3,Separator,3)(4,Item,6)(5,Separator,6)(6,Item,1)(7,Separator,1)(8,Item,4)(9,Separator,4)(10,Item,7)(11,Separator,7)(12,Item,2)(13,Separator,2)(14,Item,5)(15,Separator,5)(16,Item,8)";
-               HtmlDiff.AssertAreEqual (exp, v, "#278");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_otrtblimp_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, true);
-               string exp = @"(0,Item,0)(1,Separator,0)(2,Item,3)(3,Separator,3)(4,Item,5)(5,Separator,5)(6,Item,1)(7,Separator,1)(8,Item,4)(9,Separator,4)(10,Item,6)(11,Item,2)(12,Separator,2)";
-               HtmlDiff.AssertAreEqual (exp, v, "#279");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#280");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#281");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#282");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td><td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td><td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td><td class=""Item4"">(8,Item,4)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#283");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#284");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(8,Item,4)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#285");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td><td class=""Item3"">(6,Item,3)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#286");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td><td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item5"">(10,Item,5)</td><td class=""Separator5"">(11,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(12,Item,6)</td><td></td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#287");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td><td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td><td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item5"">(10,Item,5)</td><td class=""Separator5"">(11,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(12,Item,6)</td><td class=""Separator6"">(13,Separator,6)</td><td class=""Item7"">(14,Item,7)</td><td class=""Separator7"">(15,Separator,7)</td><td class=""Item8"">(16,Item,8)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#288");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Separator1"">(3,Separator,1)</td><td class=""Item2"">(4,Item,2)</td><td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td class=""Separator3"">(7,Separator,3)</td><td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item5"">(10,Item,5)</td><td class=""Separator5"">(11,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(12,Item,6)</td><td></td><td></td><td></td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#289");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#290");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#291");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Separator0"">(1,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#292");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Separator0"">(1,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td>
-       </tr><tr>
-               <td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td>
-       </tr><tr>
-               <td class=""Separator3"">(7,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(8,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#293");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#294");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Separator0"">(1,Separator,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Separator1"">(3,Separator,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td>
-       </tr><tr>
-               <td class=""Separator2"">(5,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td>
-       </tr><tr>
-               <td class=""Separator3"">(7,Separator,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(8,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#295");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item2"">(2,Item,2)</td><td class=""Separator2"">(3,Separator,2)</td>
-       </tr><tr>
-               <td class=""Item1"">(4,Item,1)</td><td class=""Separator1"">(5,Separator,1)</td><td class=""Item3"">(6,Item,3)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#296");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item4"">(2,Item,4)</td><td class=""Separator4"">(3,Separator,4)</td>
-       </tr><tr>
-               <td class=""Item1"">(4,Item,1)</td><td class=""Separator1"">(5,Separator,1)</td><td class=""Item5"">(6,Item,5)</td><td class=""Separator5"">(7,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item2"">(8,Item,2)</td><td class=""Separator2"">(9,Separator,2)</td><td class=""Item6"">(10,Item,6)</td><td></td>
-       </tr><tr>
-               <td class=""Item3"">(11,Item,3)</td><td class=""Separator3"">(12,Separator,3)</td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#297");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item3"">(2,Item,3)</td><td class=""Separator3"">(3,Separator,3)</td><td class=""Item6"">(4,Item,6)</td><td class=""Separator6"">(5,Separator,6)</td>
-       </tr><tr>
-               <td class=""Item1"">(6,Item,1)</td><td class=""Separator1"">(7,Separator,1)</td><td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item7"">(10,Item,7)</td><td class=""Separator7"">(11,Separator,7)</td>
-       </tr><tr>
-               <td class=""Item2"">(12,Item,2)</td><td class=""Separator2"">(13,Separator,2)</td><td class=""Item5"">(14,Item,5)</td><td class=""Separator5"">(15,Separator,5)</td><td class=""Item8"">(16,Item,8)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#298");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, true);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Separator0"">(1,Separator,0)</td><td class=""Item3"">(2,Item,3)</td><td class=""Separator3"">(3,Separator,3)</td><td class=""Item5"">(4,Item,5)</td><td class=""Separator5"">(5,Separator,5)</td>
-       </tr><tr>
-               <td class=""Item1"">(6,Item,1)</td><td class=""Separator1"">(7,Separator,1)</td><td class=""Item4"">(8,Item,4)</td><td class=""Separator4"">(9,Separator,4)</td><td class=""Item6"">(10,Item,6)</td><td></td>
-       </tr><tr>
-               <td class=""Item2"">(11,Item,2)</td><td class=""Separator2"">(12,Separator,2)</td><td></td><td></td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#299");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle""></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#300");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#301");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#302");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)(8,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#303");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle""></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#304");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)<br />(2,Item,1)(3,Separator,1)<br />(4,Item,2)(5,Separator,2)<br />(6,Item,3)(7,Separator,3)<br />(8,Item,4)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#305");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)<br />(4,Item,2)(5,Separator,2)(6,Item,3)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#306");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)<br />(4,Item,2)(5,Separator,2)(6,Item,3)(7,Separator,3)<br />(8,Item,4)(9,Separator,4)(10,Item,5)(11,Separator,5)<br />(12,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#307");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span>(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)<br />(6,Item,3)(7,Separator,3)(8,Item,4)(9,Separator,4)(10,Item,5)(11,Separator,5)<br />(12,Item,6)(13,Separator,6)(14,Item,7)(15,Separator,7)(16,Item,8)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#308");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span>(0,Item,0)(1,Separator,0)(2,Item,1)(3,Separator,1)(4,Item,2)(5,Separator,2)<br />(6,Item,3)(7,Separator,3)(8,Item,4)(9,Separator,4)(10,Item,5)(11,Separator,5)<br />(12,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#309");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_sep ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle""></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#310");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_sep ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#311");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_sep ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Separator,0)<br />(2,Item,1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#312");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_sep ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Separator,0)<br />(2,Item,1)<br />(3,Separator,1)<br />(4,Item,2)<br />(5,Separator,2)<br />(6,Item,3)<br />(7,Separator,3)<br />(8,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#313");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_sep ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle""></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#314");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_sep ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Separator,0)<br />(2,Item,1)<br />(3,Separator,1)<br />(4,Item,2)<br />(5,Separator,2)<br />(6,Item,3)<br />(7,Separator,3)<br />(8,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#315");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_sep ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,2)(3,Separator,2)<br />(4,Item,1)(5,Separator,1)(6,Item,3)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#316");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_sep ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Separator,0)(2,Item,4)(3,Separator,4)<br />(4,Item,1)(5,Separator,1)(6,Item,5)(7,Separator,5)<br />(8,Item,2)(9,Separator,2)(10,Item,6)<br />(11,Item,3)(12,Separator,3)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#317");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_sep ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span>(0,Item,0)(1,Separator,0)(2,Item,3)(3,Separator,3)(4,Item,6)(5,Separator,6)<br />(6,Item,1)(7,Separator,1)(8,Item,4)(9,Separator,4)(10,Item,7)(11,Separator,7)<br />(12,Item,2)(13,Separator,2)(14,Item,5)(15,Separator,5)(16,Item,8)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#318");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_sep ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : True
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, true);
-               string exp = @"<span>(0,Item,0)(1,Separator,0)(2,Item,3)(3,Separator,3)(4,Item,5)(5,Separator,5)<br />(6,Item,1)(7,Separator,1)(8,Item,4)(9,Separator,4)(10,Item,6)<br />(11,Item,2)(12,Separator,2)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#319");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""0"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td colspan=""0"" class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#320");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(2,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#321");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(3,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#322");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""5"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Item2"">(3,Item,2)</td><td class=""Item3"">(4,Item,3)</td><td class=""Item4"">(5,Item,4)</td>
-       </tr><tr>
-               <td colspan=""5"" class=""Footer-1"">(6,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#323");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#324");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(5,Item,4)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(6,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#325");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td><td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(5,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#326");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td><td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(5,Item,4)</td><td class=""Item5"">(6,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(7,Item,6)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(8,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#327");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""3"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td><td class=""Item4"">(5,Item,4)</td><td class=""Item5"">(6,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(7,Item,6)</td><td class=""Item7"">(8,Item,7)</td><td class=""Item8"">(9,Item,8)</td>
-       </tr><tr>
-               <td colspan=""3"" class=""Footer-1"">(10,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#328");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, true, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""3"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td><td class=""Item4"">(5,Item,4)</td><td class=""Item5"">(6,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(7,Item,6)</td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""3"" class=""Footer-1"">(8,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#329");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#330");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#331");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,1)(3,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#332");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,1)(3,Item,2)(4,Item,3)(5,Item,4)(6,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#333");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#334");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,1)(3,Item,2)(4,Item,3)(5,Item,4)(6,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#335");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,2)(3,Item,1)(4,Item,3)(5,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#336");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,4)(3,Item,1)(4,Item,5)(5,Item,2)(6,Item,6)(7,Item,3)(8,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#337");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,3)(3,Item,6)(4,Item,1)(5,Item,4)(6,Item,7)(7,Item,2)(8,Item,5)(9,Item,8)(10,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#338");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,3)(3,Item,5)(4,Item,1)(5,Item,4)(6,Item,6)(7,Item,2)(8,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#339");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#340");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#341");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Item,1)(3,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#342");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Item,1)(3,Item,2)(4,Item,3)(5,Item,4)(6,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#343");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#344");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Item,1)<br />(3,Item,2)<br />(4,Item,3)<br />(5,Item,4)<br />(6,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#345");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Item,1)<br />(3,Item,2)(4,Item,3)<br />(5,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#346");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Item,1)<br />(3,Item,2)(4,Item,3)<br />(5,Item,4)(6,Item,5)<br />(7,Item,6)<br />(8,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#347");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Item,1)(3,Item,2)<br />(4,Item,3)(5,Item,4)(6,Item,5)<br />(7,Item,6)(8,Item,7)(9,Item,8)<br />(10,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#348");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Item,1)(3,Item,2)<br />(4,Item,3)(5,Item,4)(6,Item,5)<br />(7,Item,6)<br />(8,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#349");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#350");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#351");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,1)(3,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#352");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,1)(3,Item,2)(4,Item,3)(5,Item,4)(6,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#353");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#354");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,1)(3,Item,2)(4,Item,3)(5,Item,4)(6,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#355");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,2)(3,Item,1)(4,Item,3)(5,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#356");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,4)(3,Item,1)(4,Item,5)(5,Item,2)(6,Item,6)(7,Item,3)(8,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#357");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,3)(3,Item,6)(4,Item,1)(5,Item,4)(6,Item,7)(7,Item,2)(8,Item,5)(9,Item,8)(10,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#358");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_otrtblimp_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, true, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,3)(3,Item,5)(4,Item,1)(5,Item,4)(6,Item,6)(7,Item,2)(8,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#359");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""0"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td colspan=""0"" class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#360");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(2,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#361");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(3,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#362");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""5"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Item2"">(3,Item,2)</td><td class=""Item3"">(4,Item,3)</td><td class=""Item4"">(5,Item,4)</td>
-       </tr><tr>
-               <td colspan=""5"" class=""Footer-1"">(6,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#363");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#364");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(5,Item,4)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(6,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#365");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td><td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(5,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#366");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td><td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(5,Item,4)</td><td class=""Item5"">(6,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(7,Item,6)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(8,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#367");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""3"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td><td class=""Item4"">(5,Item,4)</td><td class=""Item5"">(6,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(7,Item,6)</td><td class=""Item7"">(8,Item,7)</td><td class=""Item8"">(9,Item,8)</td>
-       </tr><tr>
-               <td colspan=""3"" class=""Footer-1"">(10,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#368");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""3"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td><td class=""Item4"">(5,Item,4)</td><td class=""Item5"">(6,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(7,Item,6)</td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""3"" class=""Footer-1"">(8,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#369");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#370");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(2,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#371");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(3,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#372");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(5,Item,4)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(6,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#373");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#374");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(5,Item,4)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(6,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#375");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td><td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(5,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#376");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item4"">(2,Item,4)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td><td class=""Item5"">(4,Item,5)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Item6"">(6,Item,6)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(8,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#377");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""3"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item3"">(2,Item,3)</td><td class=""Item6"">(3,Item,6)</td>
-       </tr><tr>
-               <td class=""Item1"">(4,Item,1)</td><td class=""Item4"">(5,Item,4)</td><td class=""Item7"">(6,Item,7)</td>
-       </tr><tr>
-               <td class=""Item2"">(7,Item,2)</td><td class=""Item5"">(8,Item,5)</td><td class=""Item8"">(9,Item,8)</td>
-       </tr><tr>
-               <td colspan=""3"" class=""Footer-1"">(10,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#378");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, true, true, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""3"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item3"">(2,Item,3)</td><td class=""Item5"">(3,Item,5)</td>
-       </tr><tr>
-               <td class=""Item1"">(4,Item,1)</td><td class=""Item4"">(5,Item,4)</td><td class=""Item6"">(6,Item,6)</td>
-       </tr><tr>
-               <td class=""Item2"">(7,Item,2)</td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""3"" class=""Footer-1"">(8,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#379");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#380");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#381");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Item,1)(3,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#382");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Item,1)(3,Item,2)(4,Item,3)(5,Item,4)(6,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#383");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#384");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Item,1)<br />(3,Item,2)<br />(4,Item,3)<br />(5,Item,4)<br />(6,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#385");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Item,1)<br />(3,Item,2)(4,Item,3)<br />(5,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#386");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Item,1)<br />(3,Item,2)(4,Item,3)<br />(5,Item,4)(6,Item,5)<br />(7,Item,6)<br />(8,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#387");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Item,1)(3,Item,2)<br />(4,Item,3)(5,Item,4)(6,Item,5)<br />(7,Item,6)(8,Item,7)(9,Item,8)<br />(10,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#388");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Item,1)(3,Item,2)<br />(4,Item,3)(5,Item,4)(6,Item,5)<br />(7,Item,6)<br />(8,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#389");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#390");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#391");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Item,1)<br />(3,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#392");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_hdr_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Item,1)<br />(3,Item,2)<br />(4,Item,3)<br />(5,Item,4)<br />(6,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#393");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#394");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_hdr_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Item,1)<br />(3,Item,2)<br />(4,Item,3)<br />(5,Item,4)<br />(6,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#395");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Item,2)<br />(3,Item,1)(4,Item,3)<br />(5,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#396");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_hdr_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Item,4)<br />(3,Item,1)(4,Item,5)<br />(5,Item,2)(6,Item,6)<br />(7,Item,3)<br />(8,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#397");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Item,3)(3,Item,6)<br />(4,Item,1)(5,Item,4)(6,Item,7)<br />(7,Item,2)(8,Item,5)(9,Item,8)<br />(10,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#398");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_hdr_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, true, false);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Item,3)(3,Item,5)<br />(4,Item,1)(5,Item,4)(6,Item,6)<br />(7,Item,2)<br />(8,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#399");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""0"" class=""Footer-1"">(0,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#400");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#401");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(2,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#402");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td><td class=""Item2"">(2,Item,2)</td><td class=""Item3"">(3,Item,3)</td><td class=""Item4"">(4,Item,4)</td>
-       </tr><tr>
-               <td colspan=""5"" class=""Footer-1"">(5,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#403");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Footer-1"">(0,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#404");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(4,Item,4)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(5,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#405");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td><td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(4,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#406");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td><td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(4,Item,4)</td><td class=""Item5"">(5,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(6,Item,6)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(7,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#407");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td><td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td><td class=""Item4"">(4,Item,4)</td><td class=""Item5"">(5,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(6,Item,6)</td><td class=""Item7"">(7,Item,7)</td><td class=""Item8"">(8,Item,8)</td>
-       </tr><tr>
-               <td colspan=""3"" class=""Footer-1"">(9,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#408");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, true, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td><td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td><td class=""Item4"">(4,Item,4)</td><td class=""Item5"">(5,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(6,Item,6)</td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""3"" class=""Footer-1"">(7,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#409");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, false);
-               string exp = @"(0,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#410");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#411");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,1)(2,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#412");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,1)(2,Item,2)(3,Item,3)(4,Item,4)(5,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#413");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, false);
-               string exp = @"(0,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#414");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,1)(2,Item,2)(3,Item,3)(4,Item,4)(5,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#415");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,2)(2,Item,1)(3,Item,3)(4,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#416");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,4)(2,Item,1)(3,Item,5)(4,Item,2)(5,Item,6)(6,Item,3)(7,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#417");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,3)(2,Item,6)(3,Item,1)(4,Item,4)(5,Item,7)(6,Item,2)(7,Item,5)(8,Item,8)(9,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#418");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_otrtblimp_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,3)(2,Item,5)(3,Item,1)(4,Item,4)(5,Item,6)(6,Item,2)(7,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#419");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#420");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#421");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)(2,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#422");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)(2,Item,2)(3,Item,3)(4,Item,4)(5,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#423");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_otrtblimp_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#424");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_otrtblimp_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Item,1)<br />(2,Item,2)<br />(3,Item,3)<br />(4,Item,4)<br />(5,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#425");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_otrtblimp_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)<br />(2,Item,2)(3,Item,3)<br />(4,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#426");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_otrtblimp_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)<br />(2,Item,2)(3,Item,3)<br />(4,Item,4)(5,Item,5)<br />(6,Item,6)<br />(7,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#427");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_otrtblimp_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"<span>(0,Item,0)(1,Item,1)(2,Item,2)<br />(3,Item,3)(4,Item,4)(5,Item,5)<br />(6,Item,6)(7,Item,7)(8,Item,8)<br />(9,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#428");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_otrtblimp_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"<span>(0,Item,0)(1,Item,1)(2,Item,2)<br />(3,Item,3)(4,Item,4)(5,Item,5)<br />(6,Item,6)<br />(7,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#429");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"(0,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#430");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#431");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,1)(2,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#432");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_otrtblimp_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,1)(2,Item,2)(3,Item,3)(4,Item,4)(5,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#433");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_otrtblimp_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"(0,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#434");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_otrtblimp_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,1)(2,Item,2)(3,Item,3)(4,Item,4)(5,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#435");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_otrtblimp_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,2)(2,Item,1)(3,Item,3)(4,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#436");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_otrtblimp_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,4)(2,Item,1)(3,Item,5)(4,Item,2)(5,Item,6)(6,Item,3)(7,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#437");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_otrtblimp_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,3)(2,Item,6)(3,Item,1)(4,Item,4)(5,Item,7)(6,Item,2)(7,Item,5)(8,Item,8)(9,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#438");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_otrtblimp_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, true, false);
-               string exp = @"(0,Item,0)(1,Item,3)(2,Item,5)(3,Item,1)(4,Item,4)(5,Item,6)(6,Item,2)(7,Footer,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#439");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""0"" class=""Footer-1"">(0,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#440");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#441");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(2,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#442");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td><td class=""Item2"">(2,Item,2)</td><td class=""Item3"">(3,Item,3)</td><td class=""Item4"">(4,Item,4)</td>
-       </tr><tr>
-               <td colspan=""5"" class=""Footer-1"">(5,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#443");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Footer-1"">(0,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#444");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(4,Item,4)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(5,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#445");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td><td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(4,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#446");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td><td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(4,Item,4)</td><td class=""Item5"">(5,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(6,Item,6)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(7,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#447");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td><td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td><td class=""Item4"">(4,Item,4)</td><td class=""Item5"">(5,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(6,Item,6)</td><td class=""Item7"">(7,Item,7)</td><td class=""Item8"">(8,Item,8)</td>
-       </tr><tr>
-               <td colspan=""3"" class=""Footer-1"">(9,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#448");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td><td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td><td class=""Item4"">(4,Item,4)</td><td class=""Item5"">(5,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(6,Item,6)</td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""3"" class=""Footer-1"">(7,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#449");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Footer-1"">(0,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#450");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(1,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#451");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(2,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#452");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(4,Item,4)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(5,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#453");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Footer-1"">(0,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#454");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(4,Item,4)</td>
-       </tr><tr>
-               <td class=""Footer-1"">(5,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#455");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item2"">(1,Item,2)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td><td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(4,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#456");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item4"">(1,Item,4)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td><td class=""Item5"">(3,Item,5)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Item6"">(5,Item,6)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td></td>
-       </tr><tr>
-               <td colspan=""2"" class=""Footer-1"">(7,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#457");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item3"">(1,Item,3)</td><td class=""Item6"">(2,Item,6)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td><td class=""Item4"">(4,Item,4)</td><td class=""Item7"">(5,Item,7)</td>
-       </tr><tr>
-               <td class=""Item2"">(6,Item,2)</td><td class=""Item5"">(7,Item,5)</td><td class=""Item8"">(8,Item,8)</td>
-       </tr><tr>
-               <td colspan=""3"" class=""Footer-1"">(9,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#458");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, false, true, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item3"">(1,Item,3)</td><td class=""Item5"">(2,Item,5)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td><td class=""Item4"">(4,Item,4)</td><td class=""Item6"">(5,Item,6)</td>
-       </tr><tr>
-               <td class=""Item2"">(6,Item,2)</td><td></td><td></td>
-       </tr><tr>
-               <td colspan=""3"" class=""Footer-1"">(7,Footer,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#459");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#460");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#461");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)(2,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#462");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)(2,Item,2)(3,Item,3)(4,Item,4)(5,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#463");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#464");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Item,1)<br />(2,Item,2)<br />(3,Item,3)<br />(4,Item,4)<br />(5,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#465");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)<br />(2,Item,2)(3,Item,3)<br />(4,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#466");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)<br />(2,Item,2)(3,Item,3)<br />(4,Item,4)(5,Item,5)<br />(6,Item,6)<br />(7,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#467");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span>(0,Item,0)(1,Item,1)(2,Item,2)<br />(3,Item,3)(4,Item,4)(5,Item,5)<br />(6,Item,6)(7,Item,7)(8,Item,8)<br />(9,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#468");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span>(0,Item,0)(1,Item,1)(2,Item,2)<br />(3,Item,3)(4,Item,4)(5,Item,5)<br />(6,Item,6)<br />(7,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#469");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#470");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#471");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Item,1)<br />(2,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#472");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_ftr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Item,1)<br />(2,Item,2)<br />(3,Item,3)<br />(4,Item,4)<br />(5,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#473");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#474");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_ftr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Item,1)<br />(2,Item,2)<br />(3,Item,3)<br />(4,Item,4)<br />(5,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#475");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,2)<br />(2,Item,1)(3,Item,3)<br />(4,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#476");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_ftr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,4)<br />(2,Item,1)(3,Item,5)<br />(4,Item,2)(5,Item,6)<br />(6,Item,3)<br />(7,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#477");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span>(0,Item,0)(1,Item,3)(2,Item,6)<br />(3,Item,1)(4,Item,4)(5,Item,7)<br />(6,Item,2)(7,Item,5)(8,Item,8)<br />(9,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#478");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_ftr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : True
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, true, false);
-               string exp = @"<span>(0,Item,0)(1,Item,3)(2,Item,5)<br />(3,Item,1)(4,Item,4)(5,Item,6)<br />(6,Item,2)<br />(7,Footer,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#479");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""0"" class=""Header-1"">(0,Header,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#480");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#481");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#482");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""5"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Item2"">(3,Item,2)</td><td class=""Item3"">(4,Item,3)</td><td class=""Item4"">(5,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#483");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#484");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(5,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#485");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td><td class=""Item3"">(4,Item,3)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#486");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td><td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(5,Item,4)</td><td class=""Item5"">(6,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(7,Item,6)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#487");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""3"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td><td class=""Item4"">(5,Item,4)</td><td class=""Item5"">(6,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(7,Item,6)</td><td class=""Item7"">(8,Item,7)</td><td class=""Item8"">(9,Item,8)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#488");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, true, false, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""3"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td><td class=""Item4"">(5,Item,4)</td><td class=""Item5"">(6,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(7,Item,6)</td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#489");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, false);
-               string exp = @"(0,Header,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#490");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)";
-               HtmlDiff.AssertAreEqual (exp, v, "#491");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#492");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,1)(3,Item,2)(4,Item,3)(5,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#493");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, false);
-               string exp = @"(0,Header,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#494");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,1)(3,Item,2)(4,Item,3)(5,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#495");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,2)(3,Item,1)(4,Item,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#496");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,4)(3,Item,1)(4,Item,5)(5,Item,2)(6,Item,6)(7,Item,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#497");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,3)(3,Item,6)(4,Item,1)(5,Item,4)(6,Item,7)(7,Item,2)(8,Item,5)(9,Item,8)";
-               HtmlDiff.AssertAreEqual (exp, v, "#498");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_otrtblimp_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,3)(3,Item,5)(4,Item,1)(5,Item,4)(6,Item,6)(7,Item,2)";
-               HtmlDiff.AssertAreEqual (exp, v, "#499");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#500");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#501");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Item,1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#502");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Item,1)(3,Item,2)(4,Item,3)(5,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#503");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_otrtblimp_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#504");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_otrtblimp_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Item,1)<br />(3,Item,2)<br />(4,Item,3)<br />(5,Item,4)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#505");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_otrtblimp_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Item,1)<br />(3,Item,2)(4,Item,3)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#506");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_otrtblimp_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Item,1)<br />(3,Item,2)(4,Item,3)<br />(5,Item,4)(6,Item,5)<br />(7,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#507");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_otrtblimp_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Item,1)(3,Item,2)<br />(4,Item,3)(5,Item,4)(6,Item,5)<br />(7,Item,6)(8,Item,7)(9,Item,8)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#508");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_otrtblimp_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Item,1)(3,Item,2)<br />(4,Item,3)(5,Item,4)(6,Item,5)<br />(7,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#509");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"(0,Header,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#510");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)";
-               HtmlDiff.AssertAreEqual (exp, v, "#511");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#512");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_otrtblimp_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,1)(3,Item,2)(4,Item,3)(5,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#513");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_otrtblimp_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"(0,Header,-1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#514");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_otrtblimp_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,1)(3,Item,2)(4,Item,3)(5,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#515");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_otrtblimp_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,2)(3,Item,1)(4,Item,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#516");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_otrtblimp_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,4)(3,Item,1)(4,Item,5)(5,Item,2)(6,Item,6)(7,Item,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#517");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_otrtblimp_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,3)(3,Item,6)(4,Item,1)(5,Item,4)(6,Item,7)(7,Item,2)(8,Item,5)(9,Item,8)";
-               HtmlDiff.AssertAreEqual (exp, v, "#518");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_otrtblimp_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, true, false, false);
-               string exp = @"(0,Header,-1)(1,Item,0)(2,Item,3)(3,Item,5)(4,Item,1)(5,Item,4)(6,Item,6)(7,Item,2)";
-               HtmlDiff.AssertAreEqual (exp, v, "#519");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""0"" class=""Header-1"">(0,Header,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#520");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#521");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#522");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""5"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Item2"">(3,Item,2)</td><td class=""Item3"">(4,Item,3)</td><td class=""Item4"">(5,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#523");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#524");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(5,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#525");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td><td class=""Item3"">(4,Item,3)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#526");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td><td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(5,Item,4)</td><td class=""Item5"">(6,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(7,Item,6)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#527");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""3"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td><td class=""Item4"">(5,Item,4)</td><td class=""Item5"">(6,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(7,Item,6)</td><td class=""Item7"">(8,Item,7)</td><td class=""Item8"">(9,Item,8)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#528");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""3"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item1"">(2,Item,1)</td><td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td><td class=""Item4"">(5,Item,4)</td><td class=""Item5"">(6,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(7,Item,6)</td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#529");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#530");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#531");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#532");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(5,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#533");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#534");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(3,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(4,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(5,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#535");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td><td class=""Item3"">(4,Item,3)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#536");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td colspan=""2"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item4"">(2,Item,4)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td><td class=""Item5"">(4,Item,5)</td>
-       </tr><tr>
-               <td class=""Item2"">(5,Item,2)</td><td class=""Item6"">(6,Item,6)</td>
-       </tr><tr>
-               <td class=""Item3"">(7,Item,3)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#537");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""3"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item3"">(2,Item,3)</td><td class=""Item6"">(3,Item,6)</td>
-       </tr><tr>
-               <td class=""Item1"">(4,Item,1)</td><td class=""Item4"">(5,Item,4)</td><td class=""Item7"">(6,Item,7)</td>
-       </tr><tr>
-               <td class=""Item2"">(7,Item,2)</td><td class=""Item5"">(8,Item,5)</td><td class=""Item8"">(9,Item,8)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#538");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, true, false, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td colspan=""3"" class=""Header-1"">(0,Header,-1)</td>
-       </tr><tr>
-               <td class=""Item0"">(1,Item,0)</td><td class=""Item3"">(2,Item,3)</td><td class=""Item5"">(3,Item,5)</td>
-       </tr><tr>
-               <td class=""Item1"">(4,Item,1)</td><td class=""Item4"">(5,Item,4)</td><td class=""Item6"">(6,Item,6)</td>
-       </tr><tr>
-               <td class=""Item2"">(7,Item,2)</td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#539");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#540");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#541");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Item,1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#542");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)(1,Item,0)(2,Item,1)(3,Item,2)(4,Item,3)(5,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#543");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#544");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Item,1)<br />(3,Item,2)<br />(4,Item,3)<br />(5,Item,4)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#545");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Item,1)<br />(3,Item,2)(4,Item,3)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#546");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Item,1)<br />(3,Item,2)(4,Item,3)<br />(5,Item,4)(6,Item,5)<br />(7,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#547");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Item,1)(3,Item,2)<br />(4,Item,3)(5,Item,4)(6,Item,5)<br />(7,Item,6)(8,Item,7)(9,Item,8)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#548");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Item,1)(3,Item,2)<br />(4,Item,3)(5,Item,4)(6,Item,5)<br />(7,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#549");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#550");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#551");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Item,1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#552");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_hdr ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Item,1)<br />(3,Item,2)<br />(4,Item,3)<br />(5,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#553");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#554");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_hdr ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)<br />(2,Item,1)<br />(3,Item,2)<br />(4,Item,3)<br />(5,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#555");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Item,2)<br />(3,Item,1)(4,Item,3)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#556");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_hdr ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Header,-1)<br />(1,Item,0)(2,Item,4)<br />(3,Item,1)(4,Item,5)<br />(5,Item,2)(6,Item,6)<br />(7,Item,3)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#557");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Item,3)(3,Item,6)<br />(4,Item,1)(5,Item,4)(6,Item,7)<br />(7,Item,2)(8,Item,5)(9,Item,8)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#558");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_hdr ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : True
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, true, false, false);
-               string exp = @"<span>(0,Header,-1)<br />(1,Item,0)(2,Item,3)(3,Item,5)<br />(4,Item,1)(5,Item,4)(6,Item,6)<br />(7,Item,2)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#559");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#560");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#561");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#562");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td><td class=""Item2"">(2,Item,2)</td><td class=""Item3"">(3,Item,3)</td><td class=""Item4"">(4,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#563");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl_otrtblimp ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#564");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl_otrtblimp ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(4,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#565");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl_otrtblimp ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td><td class=""Item3"">(3,Item,3)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#566");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl_otrtblimp ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td><td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(4,Item,4)</td><td class=""Item5"">(5,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(6,Item,6)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#567");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl_otrtblimp ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td><td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td><td class=""Item4"">(4,Item,4)</td><td class=""Item5"">(5,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(6,Item,6)</td><td class=""Item7"">(7,Item,7)</td><td class=""Item8"">(8,Item,8)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#568");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl_otrtblimp ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, true, false, false, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td><td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td><td class=""Item4"">(4,Item,4)</td><td class=""Item5"">(5,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(6,Item,6)</td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#569");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, false);
-               string exp = @"";
-               HtmlDiff.AssertAreEqual (exp, v, "#570");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, false);
-               string exp = @"(0,Item,0)";
-               HtmlDiff.AssertAreEqual (exp, v, "#571");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#572");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,1)(2,Item,2)(3,Item,3)(4,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#573");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl_otrtblimp ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, false);
-               string exp = @"";
-               HtmlDiff.AssertAreEqual (exp, v, "#574");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl_otrtblimp ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,1)(2,Item,2)(3,Item,3)(4,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#575");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl_otrtblimp ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,2)(2,Item,1)(3,Item,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#576");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl_otrtblimp ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,4)(2,Item,1)(3,Item,5)(4,Item,2)(5,Item,6)(6,Item,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#577");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl_otrtblimp ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,3)(2,Item,6)(3,Item,1)(4,Item,4)(5,Item,7)(6,Item,2)(7,Item,5)(8,Item,8)";
-               HtmlDiff.AssertAreEqual (exp, v, "#578");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl_otrtblimp ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,3)(2,Item,5)(3,Item,1)(4,Item,4)(5,Item,6)(6,Item,2)";
-               HtmlDiff.AssertAreEqual (exp, v, "#579");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"<span class=""mainstyle""></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#580");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#581");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#582");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)(2,Item,2)(3,Item,3)(4,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#583");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow_otrtblimp ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"<span class=""mainstyle""></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#584");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow_otrtblimp ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Item,1)<br />(2,Item,2)<br />(3,Item,3)<br />(4,Item,4)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#585");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow_otrtblimp ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)<br />(2,Item,2)(3,Item,3)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#586");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow_otrtblimp ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)<br />(2,Item,2)(3,Item,3)<br />(4,Item,4)(5,Item,5)<br />(6,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#587");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow_otrtblimp ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"<span>(0,Item,0)(1,Item,1)(2,Item,2)<br />(3,Item,3)(4,Item,4)(5,Item,5)<br />(6,Item,6)(7,Item,7)(8,Item,8)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#588");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow_otrtblimp ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"<span>(0,Item,0)(1,Item,1)(2,Item,2)<br />(3,Item,3)(4,Item,4)(5,Item,5)<br />(6,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#589");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"";
-               HtmlDiff.AssertAreEqual (exp, v, "#590");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"(0,Item,0)";
-               HtmlDiff.AssertAreEqual (exp, v, "#591");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,1)";
-               HtmlDiff.AssertAreEqual (exp, v, "#592");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow_otrtblimp ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,1)(2,Item,2)(3,Item,3)(4,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#593");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow_otrtblimp ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"";
-               HtmlDiff.AssertAreEqual (exp, v, "#594");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow_otrtblimp ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,1)(2,Item,2)(3,Item,3)(4,Item,4)";
-               HtmlDiff.AssertAreEqual (exp, v, "#595");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow_otrtblimp ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,2)(2,Item,1)(3,Item,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#596");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow_otrtblimp ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,4)(2,Item,1)(3,Item,5)(4,Item,2)(5,Item,6)(6,Item,3)";
-               HtmlDiff.AssertAreEqual (exp, v, "#597");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow_otrtblimp ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,3)(2,Item,6)(3,Item,1)(4,Item,4)(5,Item,7)(6,Item,2)(7,Item,5)(8,Item,8)";
-               HtmlDiff.AssertAreEqual (exp, v, "#598");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow_otrtblimp ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : True
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, true, false, false, false);
-               string exp = @"(0,Item,0)(1,Item,3)(2,Item,5)(3,Item,1)(4,Item,4)(5,Item,6)(6,Item,2)";
-               HtmlDiff.AssertAreEqual (exp, v, "#599");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_tbl ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#600");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_tbl ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#601");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_tbl ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#602");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_tbl ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td><td class=""Item2"">(2,Item,2)</td><td class=""Item3"">(3,Item,3)</td><td class=""Item4"">(4,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#603");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_tbl ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#604");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_tbl ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(4,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#605");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_tbl ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td><td class=""Item3"">(3,Item,3)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#606");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_tbl ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td><td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(4,Item,4)</td><td class=""Item5"">(5,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(6,Item,6)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#607");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_tbl ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td><td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td><td class=""Item4"">(4,Item,4)</td><td class=""Item5"">(5,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(6,Item,6)</td><td class=""Item7"">(7,Item,7)</td><td class=""Item8"">(8,Item,8)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#608");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_tbl ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item1"">(1,Item,1)</td><td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td><td class=""Item4"">(4,Item,4)</td><td class=""Item5"">(5,Item,5)</td>
-       </tr><tr>
-               <td class=""Item6"">(6,Item,6)</td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#609");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_tbl ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#610");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_tbl ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#611");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_tbl ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(1,Item,1)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#612");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_tbl ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(4,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#613");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_tbl ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#614");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_tbl ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td>
-       </tr><tr>
-               <td class=""Item1"">(1,Item,1)</td>
-       </tr><tr>
-               <td class=""Item2"">(2,Item,2)</td>
-       </tr><tr>
-               <td class=""Item3"">(3,Item,3)</td>
-       </tr><tr>
-               <td class=""Item4"">(4,Item,4)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#615");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_tbl ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item2"">(1,Item,2)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td><td class=""Item3"">(3,Item,3)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#616");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_tbl ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table class=""mainstyle"" border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item4"">(1,Item,4)</td>
-       </tr><tr>
-               <td class=""Item1"">(2,Item,1)</td><td class=""Item5"">(3,Item,5)</td>
-       </tr><tr>
-               <td class=""Item2"">(4,Item,2)</td><td class=""Item6"">(5,Item,6)</td>
-       </tr><tr>
-               <td class=""Item3"">(6,Item,3)</td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#617");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_tbl ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item3"">(1,Item,3)</td><td class=""Item6"">(2,Item,6)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td><td class=""Item4"">(4,Item,4)</td><td class=""Item7"">(5,Item,7)</td>
-       </tr><tr>
-               <td class=""Item2"">(6,Item,2)</td><td class=""Item5"">(7,Item,5)</td><td class=""Item8"">(8,Item,8)</td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#618");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_tbl ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Table
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Table, false, false, false, false);
-               string exp = @"<table border=""0"">
-       <tr>
-               <td class=""Item0"">(0,Item,0)</td><td class=""Item3"">(1,Item,3)</td><td class=""Item5"">(2,Item,5)</td>
-       </tr><tr>
-               <td class=""Item1"">(3,Item,1)</td><td class=""Item4"">(4,Item,4)</td><td class=""Item6"">(5,Item,6)</td>
-       </tr><tr>
-               <td class=""Item2"">(6,Item,2)</td><td></td><td></td>
-       </tr>
-</table>";
-               HtmlDiff.AssertAreEqual (exp, v, "#619");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_horiz_flow ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle""></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#620");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_horiz_flow ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#621");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_horiz_flow ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#622");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_horiz_flow ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)(2,Item,2)(3,Item,3)(4,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#623");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_horiz_flow ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle""></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#624");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_horiz_flow ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Item,1)<br />(2,Item,2)<br />(3,Item,3)<br />(4,Item,4)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#625");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_horiz_flow ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)<br />(2,Item,2)(3,Item,3)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#626");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_horiz_flow ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,1)<br />(2,Item,2)(3,Item,3)<br />(4,Item,4)(5,Item,5)<br />(6,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#627");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_horiz_flow ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span>(0,Item,0)(1,Item,1)(2,Item,2)<br />(3,Item,3)(4,Item,4)(5,Item,5)<br />(6,Item,6)(7,Item,7)(8,Item,8)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#628");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_horiz_flow ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Horizontal
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Horizontal, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span>(0,Item,0)(1,Item,1)(2,Item,2)<br />(3,Item,3)(4,Item,4)(5,Item,5)<br />(6,Item,6)<br /></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#629");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_0itms_vert_flow ()
-       {
-               // cols              : 0
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle""></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#630");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_1itms_vert_flow ()
-       {
-               // cols              : 0
-               // cnt               : 1
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 1, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#631");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_2itms_vert_flow ()
-       {
-               // cols              : 0
-               // cnt               : 2
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 2, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Item,1)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#632");
-       }
-
-
-       [Test]
-       public void RepeatInfo_0cols_5itms_vert_flow ()
-       {
-               // cols              : 0
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (0, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Item,1)<br />(2,Item,2)<br />(3,Item,3)<br />(4,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#633");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_0itms_vert_flow ()
-       {
-               // cols              : 1
-               // cnt               : 0
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 0, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle""></span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#634");
-       }
-
-
-       [Test]
-       public void RepeatInfo_1cols_5itms_vert_flow ()
-       {
-               // cols              : 1
-               // cnt               : 5
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (1, 5, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)<br />(1,Item,1)<br />(2,Item,2)<br />(3,Item,3)<br />(4,Item,4)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#635");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_4itms_vert_flow ()
-       {
-               // cols              : 2
-               // cnt               : 4
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 4, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,2)<br />(2,Item,1)(3,Item,3)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#636");
-       }
-
-
-       [Test]
-       public void RepeatInfo_2cols_7itms_vert_flow ()
-       {
-               // cols              : 2
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (2, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span class=""mainstyle"">(0,Item,0)(1,Item,4)<br />(2,Item,1)(3,Item,5)<br />(4,Item,2)(5,Item,6)<br />(6,Item,3)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#637");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_9itms_vert_flow ()
-       {
-               // cols              : 3
-               // cnt               : 9
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 9, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span>(0,Item,0)(1,Item,3)(2,Item,6)<br />(3,Item,1)(4,Item,4)(5,Item,7)<br />(6,Item,2)(7,Item,5)(8,Item,8)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#638");
-       }
-
-
-       [Test]
-       public void RepeatInfo_3cols_7itms_vert_flow ()
-       {
-               // cols              : 3
-               // cnt               : 7
-               // RepeatDirection   : Vertical
-               // RepeatLayout      : Flow
-               // OuterTableImplied : False
-               // Header            : False
-               // Footer            : False
-               // Separator         : False
-
-
-               string v = RepeatInfoUser.DoTest (3, 7, RepeatDirection.Vertical, RepeatLayout.Flow, false, false, false, false);
-               string exp = @"<span>(0,Item,0)(1,Item,3)(2,Item,5)<br />(3,Item,1)(4,Item,4)(5,Item,6)<br />(6,Item,2)</span>";
-               HtmlDiff.AssertAreEqual (exp, v, "#639");
-       }
-
-
-}
-}
-#endif

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.4.0.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.4.0.cs
index ecdf82387178897008415dae7f86bf9b30ebfa67..a3772412270d2034fc106168a237dd41420adfa9 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.4.0.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.4.0.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 
 // THIS IS AUTOGENERATED DO NOT EDIT
 //
@@ -24558,4 +24557,3 @@ public class RepeatInfo_Autogen {
 
 }
 }
-#endif

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.cs
index 218d8d896d9c25f846449641b43f0e30f1398433..cf59b7d81d7725758e62eb150eb3b8533a83b9d2 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.cs
@@ -167,13 +167,8 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Test]
                public void RenderRepeater_BaseControl ()
                {
-#if NET_4_0
                        string noid = "<table>\n\t<tr>\n\t\t<td>0</td><td></td><td></td>\n\t</tr>\n</table>";
                        string id_enabled = "<table id=\"foo\" class=\"aspNetDisabled\">\n\t<tr>\n\t\t<td>0</td><td></td><td></td>\n\t</tr>\n</table>";
-#else
-                       string noid = "<table border=\"0\">\n\t<tr>\n\t\t<td>0</td><td></td><td></td>\n\t</tr>\n</table>";
-                       string id_enabled = "<table id=\"foo\" disabled=\"disabled\" border=\"0\">\n\t<tr>\n\t\t<td>0</td><td></td><td></td>\n\t</tr>\n</table>";
-#endif
                        RenderRepeater_BaseControl (noid, "Table", new Table ());
                        RenderRepeater_BaseControl (noid, "DataList", new DataList ());
                        RenderRepeater_BaseControl (noid, "DataListItem", new DataListItem (0, ListItemType.Item));

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.gen.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.gen.cs
index f1bfcb7114b6c9a93bcd2ee1e662c239e7378471..4d87fce7d59a23f469902a2e534f648973e0d845 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.gen.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.gen.cs
@@ -45,13 +45,11 @@ class X {
 
                        case RepeatLayout.Table:
                                return "tbl";
-#if NET_4_0
                        case RepeatLayout.OrderedList:
                                return "ol";
 
                        case RepeatLayout.UnorderedList:
                                return "ul";
-#endif
                        default:
                                throw new InvalidOperationException ("Unsupported layout value: " + layout);
                }
@@ -59,11 +57,7 @@ class X {
 
        static void Main ()
        {
-#if NET_4_0
                Console.WriteLine ("#if NET_4_0");
-#else
-               Console.WriteLine ("#if NET_2_0 && !NET_4_0");
-#endif
                bool isMono = Type.GetType ("Mono.Runtime", false) != null;
 
                Console.WriteLine (@"
@@ -125,12 +119,8 @@ public class RepeatInfo_Autogen {{
                        new int [] {3, 9},
                        new int [] {3, 7}
                };
-#if NET_4_0
                int ntests = 1 << 7;
                int lcount = -1;
-#else
-               int ntests = 1 << 6;
-#endif
                RepeatDirection d;
                RepeatLayout l;
                bool oti, hdr, ftr, sep;
@@ -138,13 +128,9 @@ public class RepeatInfo_Autogen {{
 
                for (int i = 0; i < ntests; i ++) {
                        d = (RepeatDirection) (i & (1 << 0));
-#if NET_4_0
                        if ((i % 2) == 0)
                                lcount++;
                        l = (RepeatLayout) (lcount % 4);
-#else
-                       l = (RepeatLayout) ((i & (1 << 1)) >> 1);
-#endif
                        oti = (i & (1 << 3)) == 0;
                        hdr = (i & (1 << 4)) == 0;
                        ftr = (i & (1 << 5)) == 0;

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RouteParameterTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RouteParameterTest.cs
index dccaf32652068ac9d6fe6dc21821a724db72be76..eec1e9bc2c23feef3d6eaa86041c7fe49dfbc300 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RouteParameterTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RouteParameterTest.cs
@@ -23,7 +23,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -177,4 +176,3 @@ namespace MonoTests.System.Web.UI.WebControls
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
index 9d8d7ae6ca5e77d1e3be1af8115d8dca3f1df38e..e44c3db5d61f0c2f648f4f75b97ae606ce4e6c43 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
@@ -452,9 +452,7 @@ namespace MonoTests.System.Web.UI.WebControls
                                evaluateCount = 0;
                        }
 
-#if NET_4_0
                        internal
-#endif
                        protected override object Evaluate (HttpContext context, Control control) {
                                evaluateCount++;
                                return String.Format ("{0}{1}", DefaultValue, evaluateCount);

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/TableTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/TableTest.cs
index 46adf22e5ae1d258b1015d06dbe3a96cfb05c762..1daefe5a3a9ad680a2450143b5527e1ad3effc1c 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/TableTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/TableTest.cs
@@ -112,11 +112,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        TestTable t = new TestTable ();
                        t.Caption = "CaptionText";
                        string html = t.Render ();
-#if NET_4_0
                        string orig = "<table>\n\t<caption>\n\t\tCaptionText\n\t</caption>\n</table>";
-#else
-                       string orig = "<table border=\"0\">\n\t<caption>\n\t\tCaptionText\n\t</caption>\n</table>";
-#endif
                        HtmlDiff.AssertAreEqual (orig, html, "Caption");
                }
 
@@ -127,11 +123,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        t.Caption = "CaptionText";
                        t.CaptionAlign = TableCaptionAlign.Left; 
                        string html = t.Render ();
-#if NET_4_0
                        string orig = "<table>\n\t<caption align=\"Left\">\n\t\tCaptionText\n\t</caption>\n</table>";
-#else
-                       string orig = "<table border=\"0\">\n\t<caption align=\"Left\">\n\t\tCaptionText\n\t</caption>\n</table>";
-#endif
                        HtmlDiff.AssertAreEqual (orig, html, "CaptionAlign");
                }
                [Test]
@@ -251,28 +243,16 @@ namespace MonoTests.System.Web.UI.WebControls {
                {
                        TestTable t = new TestTable ();
                        string s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table>\n\n</table>", s, "empty/default");
-#else
-                       Assert.AreEqual ("<table border=\"0\">\n\n</table>", s, "empty/default");
-#endif
 
                        t.CellPadding = 1;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table cellpadding=\"1\">\n\n</table>", s, "CellPadding");
-#else
-                       Assert.AreEqual ("<table cellpadding=\"1\" border=\"0\">\n\n</table>", s, "CellPadding");
-#endif
                        t.CellPadding = -1;
 
                        t.CellSpacing = 2;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table cellspacing=\"2\">\n\n</table>", s, "CellSpacing");
-#else
-                       Assert.AreEqual ("<table cellspacing=\"2\" border=\"0\">\n\n</table>", s, "CellSpacing");
-#endif
                        t.CellSpacing = -1;
 
                        t.GridLines = GridLines.Horizontal;
@@ -288,125 +268,61 @@ namespace MonoTests.System.Web.UI.WebControls {
 
                        t.BorderWidth = new Unit (2);
                        s = t.Render ();
-#if NET_4_0
                        Assert.IsTrue ((s.IndexOf ("\"border-width:2px;border-style:solid;\"") > 0), "border=0/2");
-#else
-                       Assert.IsTrue ((s.IndexOf ("border=\"0\"") > 0), "border=0/2");
-#endif
                        t.GridLines = GridLines.Horizontal;
                        s = t.Render ();
-#if NET_4_0
                        Console.WriteLine (s);
                        Assert.IsTrue ((s.IndexOf ("rules=\"rows\" style=\"border-width:2px;border-style:solid;\"") > 0), "2/GridLines.Horizontal");
-#else
-                       Assert.IsTrue ((s.IndexOf ("rules=\"rows\" border=\"2\"") > 0), "2/GridLines.Horizontal");
-#endif
                        t.GridLines = GridLines.Vertical;
                        s = t.Render ();
-#if NET_4_0
                        Assert.IsTrue ((s.IndexOf ("rules=\"cols\" style=\"border-width:2px;border-style:solid;\"") > 0), "2/GridLines.Vertical");
-#else
-                       Assert.IsTrue ((s.IndexOf ("rules=\"cols\" border=\"2\"") > 0), "2/GridLines.Vertical");
-#endif
                        t.GridLines = GridLines.Both;
                        s = t.Render ();
-#if NET_4_0
                        Assert.IsTrue ((s.IndexOf ("rules=\"all\" style=\"border-width:2px;border-style:solid;\"") > 0), "2/GridLines.Both");
-#else
-                       Assert.IsTrue ((s.IndexOf ("rules=\"all\" border=\"2\"") > 0), "2/GridLines.Both");
-#endif
                        t.GridLines = GridLines.None;
                        t.BorderWidth = new Unit ();
 
                        t.HorizontalAlign = HorizontalAlign.Left;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table align=\"left\">\n\n</table>", s.ToLower (), "HorizontalAlign.Left");
-#else
-                       Assert.AreEqual ("<table align=\"left\" border=\"0\">\n\n</table>", s.ToLower (), "HorizontalAlign.Left");
-#endif
                        t.HorizontalAlign = HorizontalAlign.Center;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table align=\"center\">\n\n</table>", s.ToLower (), "HorizontalAlign.Center");
-#else
-                       Assert.AreEqual ("<table align=\"center\" border=\"0\">\n\n</table>", s.ToLower (), "HorizontalAlign.Center");
-#endif
                        t.HorizontalAlign = HorizontalAlign.Right;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table align=\"right\">\n\n</table>", s.ToLower (), "HorizontalAlign.Right");
-#else
-                       Assert.AreEqual ("<table align=\"right\" border=\"0\">\n\n</table>", s.ToLower (), "HorizontalAlign.Right");
-#endif
                        t.HorizontalAlign = HorizontalAlign.Justify;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table align=\"justify\">\n\n</table>", s.ToLower (), "HorizontalAlign.Justify");
-#else
-                       Assert.AreEqual ("<table align=\"justify\" border=\"0\">\n\n</table>", s.ToLower (), "HorizontalAlign.Justify");
-#endif
                        t.HorizontalAlign = HorizontalAlign.NotSet;
 
                        t.Caption = "mono";
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table>\n\t<caption>\n\t\tmono\n\t</caption>\n</table>", s.ToLower (), "Caption");
-#else
-                       Assert.AreEqual ("<table border=\"0\">\n\t<caption>\n\t\tmono\n\t</caption>\n</table>", s.ToLower (), "Caption");
-#endif
 
                        t.CaptionAlign = TableCaptionAlign.Top;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table>\n\t<caption align=\"top\">\n\t\tmono\n\t</caption>\n</table>", s.ToLower (), "Caption/Top");
-#else
-                       Assert.AreEqual ("<table border=\"0\">\n\t<caption align=\"top\">\n\t\tmono\n\t</caption>\n</table>", s.ToLower (), "Caption/Top");
-#endif
                        t.CaptionAlign = TableCaptionAlign.Bottom;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table>\n\t<caption align=\"bottom\">\n\t\tmono\n\t</caption>\n</table>", s.ToLower (), "Caption/Bottom");
-#else
-                       Assert.AreEqual ("<table border=\"0\">\n\t<caption align=\"bottom\">\n\t\tmono\n\t</caption>\n</table>", s.ToLower (), "Caption/Bottom");
-#endif
                        t.CaptionAlign = TableCaptionAlign.Right;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table>\n\t<caption align=\"right\">\n\t\tmono\n\t</caption>\n</table>", s.ToLower (), "Caption/Right");
-#else
-                       Assert.AreEqual ("<table border=\"0\">\n\t<caption align=\"right\">\n\t\tmono\n\t</caption>\n</table>", s.ToLower (), "Caption/Right");
-#endif
                        t.CaptionAlign = TableCaptionAlign.Left;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table>\n\t<caption align=\"left\">\n\t\tmono\n\t</caption>\n</table>", s.ToLower (), "Caption/Left");
-#else
-                       Assert.AreEqual ("<table border=\"0\">\n\t<caption align=\"left\">\n\t\tmono\n\t</caption>\n</table>", s.ToLower (), "Caption/Left");
-#endif
                        t.Caption = null;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table>\n\n</table>", s, "CaptionAlign without Caption");
-#else
-                       Assert.AreEqual ("<table border=\"0\">\n\n</table>", s, "CaptionAlign without Caption");
-#endif
                        t.CaptionAlign = TableCaptionAlign.NotSet;
 
                        t.BackImageUrl = imageUrl;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table style=\"background-image:url(http://www.mono-project.com/stylesheets/images.wiki.png);\">\n\n</table>", s, "BackImageUrl");
-#else
-                       Assert.AreEqual ("<table border=\"0\" style=\"background-image:url(http://www.mono-project.com/stylesheets/images.wiki.png);\">\n\n</table>", s, "BackImageUrl");
-#endif
                        t.BackImageUrl = localImageUrl;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual ("<table style=\"background-image:url(foo.jpg);\">\n\n</table>", s, "BackImageUrl");
-#else
-                       Assert.AreEqual ("<table border=\"0\" style=\"background-image:url(foo.jpg);\">\n\n</table>", s, "BackImageUrl");
-#endif
                        t.BackImageUrl = String.Empty;
                }
 
@@ -416,11 +332,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (RenderInAspxPage_OnLoad));
                        string res = t.Run ();
-#if NET_4_0
                        Assert.IsTrue (res.IndexOf ("<table id=\"MagicID_A1C3\" style=\"background-image:url(foo.jpg);\"") != -1, res);
-#else
-                       Assert.IsTrue (res.IndexOf ("<table id=\"MagicID_A1C3\" border=\"0\" style=\"background-image:url(foo.jpg);\"")!= -1, res);
-#endif
                }
 
                public static void RenderInAspxPage_OnLoad (Page p)
@@ -474,31 +386,19 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Assert.AreEqual (1, t.Rows.Count, "r1");
                        Assert.AreEqual (1, t.Controls.Count, "c1");
                        string s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual (Adjust ("<table>\n\t<tr>\n\n\t</tr>\n</table>"), Adjust (s), "tr-1");
-#else
-                       Assert.AreEqual (Adjust ("<table border=\"0\">\n\t<tr>\n\n\t</tr>\n</table>"), Adjust (s), "tr-1");
-#endif
 
                        // change instance properties
                        tr.HorizontalAlign = HorizontalAlign.Justify;
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual (Adjust ("<table>\n\t<tr align=\"justify\">\n\n\t</tr>\n</table>"), Adjust (s), "tr-1j");
-#else
-                       Assert.AreEqual (Adjust ("<table border=\"0\">\n\t<tr align=\"justify\">\n\n\t</tr>\n</table>"), Adjust (s), "tr-1j");
-#endif
 
                        // add it again (same instance)
                        t.Rows.Add (tr);
                        Assert.AreEqual (1, t.Rows.Count, "t1bis");
                        Assert.AreEqual (1, t.Controls.Count, "c1bis");
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual (Adjust ("<table>\n\t<tr align=\"justify\">\n\n\t</tr>\n</table>"), Adjust (s), "tr-1bis");
-#else
-                       Assert.AreEqual (Adjust ("<table border=\"0\">\n\t<tr align=\"justify\">\n\n\t</tr>\n</table>"), Adjust (s), "tr-1bis");
-#endif
                        tr.HorizontalAlign = HorizontalAlign.NotSet;
 
                        tr = new TableRow ();
@@ -507,11 +407,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Assert.AreEqual (2, t.Rows.Count, "r2");
                        Assert.AreEqual (2, t.Controls.Count, "c2");
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual (Adjust ("<table>\n\t<tr>\n\n\t</tr><tr align=\"justify\">\n\n\t</tr>\n</table>"), Adjust (s), "tr-2");
-#else
-                       Assert.AreEqual (Adjust ("<table border=\"0\">\n\t<tr>\n\n\t</tr><tr align=\"justify\">\n\n\t</tr>\n</table>"), Adjust (s), "tr-2");
-#endif
 
                        tr = new TableRow ();
                        tr.VerticalAlign = VerticalAlign.Bottom;
@@ -519,19 +415,11 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Assert.AreEqual (3, t.Rows.Count, "r3");
                        Assert.AreEqual (3, t.Controls.Count, "c3");
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual (Adjust ("<table>\n\t<tr>\n\n\t</tr><tr align=\"justify\">\n\n\t</tr><tr valign=\"bottom\">\n\n\t</tr>\n</table>"), Adjust (s), "tr-3");
-#else
-                       Assert.AreEqual (Adjust ("<table border=\"0\">\n\t<tr>\n\n\t</tr><tr align=\"justify\">\n\n\t</tr><tr valign=\"bottom\">\n\n\t</tr>\n</table>"), Adjust (s), "tr-3");
-#endif
 
                        t.Caption = "caption";
                        s = t.Render ();
-#if NET_4_0
                        Assert.AreEqual (Adjust ("<table>\n\t<caption>\n\t\tcaption\n\t</caption><tr>\n\n\t</tr><tr align=\"justify\">\n\n\t</tr><tr valign=\"bottom\">\n\n\t</tr>\n</table>"), Adjust (s), "tr-2c");
-#else
-                       Assert.AreEqual (Adjust ("<table border=\"0\">\n\t<caption>\n\t\tcaption\n\t</caption><tr>\n\n\t</tr><tr align=\"justify\">\n\n\t</tr><tr valign=\"bottom\">\n\n\t</tr>\n</table>"), Adjust (s), "tr-2c");
-#endif
                }
 
                [Test]
@@ -620,11 +508,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Table t = new Table ();
                        t.RenderBeginTag (writer);
                        string s = writer.InnerWriter.ToString ();
-#if NET_4_0
                        Assert.AreEqual ("<table>\n", s, "empty");
-#else
-                       Assert.AreEqual ("<table border=\"0\">\n", s, "empty");
-#endif
                }
 
                [Test]
@@ -635,11 +519,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        t.CellPadding = 1;
                        t.RenderBeginTag (writer);
                        string s = writer.InnerWriter.ToString ();
-#if NET_4_0
                        Assert.AreEqual ("<table cellpadding=\"1\">\n", s, "CellPadding");
-#else
-                       Assert.AreEqual ("<table cellpadding=\"1\" border=\"0\">\n", s, "CellPadding");
-#endif
                }
 
                [Test]
@@ -650,11 +530,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        t.Caption = "caption";
                        t.RenderBeginTag (writer);
                        string s = writer.InnerWriter.ToString ();
-#if NET_4_0
                        Assert.AreEqual ("<table>\n\t<caption>\n\t\tcaption\n\t</caption>", s, "caption");
-#else
-                       Assert.AreEqual ("<table border=\"0\">\n\t<caption>\n\t\tcaption\n\t</caption>", s, "caption");
-#endif
                }
 
                [Test]
@@ -666,11 +542,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        t.CaptionAlign = TableCaptionAlign.Top;
                        t.RenderBeginTag (writer);
                        string s = writer.InnerWriter.ToString ();
-#if NET_4_0
                        Assert.AreEqual ("<table>\n\t<caption align=\"top\">\n\t\tcaption\n\t</caption>", s.ToLower (), "caption");
-#else
-                       Assert.AreEqual ("<table border=\"0\">\n\t<caption align=\"top\">\n\t\tcaption\n\t</caption>", s.ToLower (), "caption");
-#endif
                }
 
                [Test]
@@ -681,11 +553,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        t.Rows.Add (new TableRow ());
                        t.RenderBeginTag (writer);
                        string s = writer.InnerWriter.ToString ();
-#if NET_4_0
                        Assert.AreEqual ("<table>\n", s, "tr");
-#else
-                       Assert.AreEqual ("<table border=\"0\">\n", s, "tr");
-#endif
                }
 
                [Test]

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/TextBoxTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/TextBoxTest.cs
index a50d339cfaf1563489bf5ce848db168a1ee2b947..88388e870fc1a952ea30419a2a9b59da2c0f9467 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/TextBoxTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/TextBoxTest.cs
@@ -105,11 +105,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Poker t = new Poker ();
                        t.TextMode = TextBoxMode.MultiLine;
                        t.Text = "</textarea>";
-#if NET_4_0
                        string exp = "<textarea rows=\"2\" cols=\"20\">\r\n&lt;/textarea&gt;</textarea>";
-#else
-                       string exp = "<textarea rows=\"2\" cols=\"20\">&lt;/textarea&gt;</textarea>";
-#endif
 
                        HtmlDiff.AssertAreEqual(exp, t.Render (),"MultilineRenderEscape");
                }
@@ -164,11 +160,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        t.ValidationGroup = "VG";
                        t.CausesValidation = true;
                        t.TextMode = TextBoxMode.MultiLine;
-#if NET_4_0
                        string exp = "<textarea rows=\"2\" cols=\"20\">\r\n</textarea>";
-#else
-                       string exp = "<textarea rows=\"2\" cols=\"20\"></textarea>";
-#endif
                        HtmlDiff.AssertAreEqual (exp, t.Render (),"ValidationRender");
                }
 

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeNodeTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeNodeTest.cs
index 2cf00c0f6f06cd9fc3f1f0da56ac0c11cacf3f5d..6fae07cfcd189566ece431a9f14062d88fad7857 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeNodeTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeNodeTest.cs
@@ -156,18 +156,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Category ("NunitWeb")]
                public void TreeNode_NavigateUrl () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadNavigateUrl));
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"NavigateUrl\" id=\"treeview1t0\">TreeNode1</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget =
-@"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=kffkK8wYLPknq-W8AKNdNQ2&amp;t=632883840303269703"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><img src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zZhMbc1ZCZv4nlS9J-l53l41&amp;t=632883840303269703"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""NavigateUrl"" id=""treeview1t0"">TreeNode1</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "PostbackNavigate");
                }
@@ -194,23 +183,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Category ("NunitWeb")]
                public void TreeNode_Render () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadRender));
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tvalue&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse text\" style=\"border-width:0;\" /></a></td><td><a href=\"navigateUrl\" target=\"target\" title=\"ToolTip\" id=\"treeview1t0i\" tabindex=\"-1\"><img src=\"imageUrl\" alt=\"ImageToolTip\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><input type=\"checkbox\" name=\"treeview1n0CheckBox\" id=\"treeview1n0CheckBox\" checked=\"checked\" title=\"ToolTip\" /><a class=\"treeview1_0\" href=\"navigateUrl\" target=\"target\" title=\"ToolTip\" id=\"treeview1t0\">text</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;svalue\\\\childenode&#39;)\" id=\"treeview1t1\">childenode</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget =
-@"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=kffkK8wYLPknq-W8AKNdNQ2&amp;t=632883840303269703"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a id=""treeview1n0"" href=""javascript:TreeView_ToggleNode(treeview1_Data,0,treeview1n0,' ',treeview1n0Nodes)""><img src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zW7-1Af97Wq_r6fRK7PDqP81&amp;t=632883840303269703"" alt=""Collapse text"" style=""border-width:0;"" /></a></td><td><a href=""navigateUrl"" target=""target"" onclick=""javascript:TreeView_SelectNode(treeview1_Data, this,'treeview1t0');javascript:TreeView_ToggleNode(treeview1_Data,0,treeview1n0,' ',treeview1n0Nodes)"" title=""ToolTip"" id=""treeview1t0i""><img src=""imageUrl"" alt=""ImageToolTip"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><input type=""checkbox"" name=""treeview1n0CheckBox"" id=""treeview1n0CheckBox"" checked=""checked"" title=""text"" /><a class=""treeview1_0"" href=""navigateUrl"" target=""target"" onclick=""javascript:TreeView_SelectNode(treeview1_Data, this,'treeview1t0');javascript:TreeView_ToggleNode(treeview1_Data,0,treeview1n0,' ',treeview1n0Nodes)"" title=""ToolTip"" id=""treeview1t0"">text</a></td>
-               </tr>
-       </table>
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zZhMbc1ZCZv4nlS9J-l53l41&amp;t=632883840303269703"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','svalue\\childenode')"" onclick=""TreeView_SelectNode(treeview1_Data, this,'treeview1t1');"" id=""treeview1t1"">childenode</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "Render");
                }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs
index c67c20264c7d0a6d74e50c2f11556b0f52f71846..26c5088ccf80d21e12be7aaaee864949746300b3 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs
@@ -686,37 +686,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Render_Defaults () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadRenderDefaults));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t1\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t2\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t3\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t4\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t5\">Section</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t1"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t2"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t3"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t4"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t5"">Section</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderDefaults");
@@ -743,69 +713,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadRenderLevelStyleCssClass));
 #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Book\" style=\"border-width:0;\" /></a></td><td class=\"TestCssClass1 treeview1_2\" style=\"white-space:nowrap;\"><a class=\"treeview1_0 TestCssClass1 treeview1_1\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\" style=\"border-style:none;font-size:1em;\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td class=\"TestCssClass2 treeview1_4\" style=\"white-space:nowrap;\"><a class=\"treeview1_0 TestCssClass2 treeview1_3\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t1\" style=\"border-style:none;font-size:1em;\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t2\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t3\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td class=\"TestCssClass2 treeview1_4\" style=\"white-space:nowrap;\"><a class=\"treeview1_0 TestCssClass2 treeview1_3\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t4\" style=\"border-style:none;font-size:1em;\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t5\">Section</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img height=""0"" width=""0"" src=""/WebResource.axd?d=0d4cddf62c21b386a0c479d4b29c5a4c0a78811622d960d7&amp;t=634020843490000000"" alt=""Skip Navigation Links."" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','ec|0')""><img alt=""Collapse Book"" src=""/WebResource.axd?d=2ffadef8bb28bb33bd311b2cae0874942ed83fb6bc74f1d5&amp;t=634020843490000000"" style=""border-width:0;"" /></a></td><td class=""TestCssClass1 treeview1_2"" style=""white-space:nowrap;""><a class=""treeview1_0 TestCssClass1 treeview1_1"" href=""javascript:__doPostBack('treeview1','sel|0')"">Book</a></td>
-               </tr><tr style=""height:0px;"">
-                       <td></td>
-
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr style=""height:0px;"">
-                       <td></td>
-               </tr><tr>
-                       <td><div style=""width:20px;height:1px;"">
-
-                       </div></td><td><a href=""javascript:__doPostBack('treeview1','ec|0_0')""><img alt=""Collapse Chapter"" src=""/WebResource.axd?d=2ffadef8bb28bb33bd311b2cae0874942ed83fb6bc74f1d5&amp;t=634020843490000000"" style=""border-width:0;"" /></a></td><td class=""TestCssClass2 treeview1_4"" style=""white-space:nowrap;""><a class=""treeview1_0 TestCssClass2 treeview1_3"" href=""javascript:__doPostBack('treeview1','sel|0_0')"">Chapter</a></td>
-               </tr><tr style=""height:0px;"">
-
-                       <td></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px;"">
-
-                       </div></td><td><div style=""width:20px;height:1px;"">
-
-                       </div></td><td><img alt="""" src=""/WebResource.axd?d=2ffadef8bb28bb335d56d5a83863fb8971aa8a175d1537f9&amp;t=634020843490000000"" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sel|0_0_0')"">Section</a></td>
-
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px;"">
-
-                       </div></td><td><div style=""width:20px;height:1px;"">
-
-                       </div></td><td><img alt="""" src=""/WebResource.axd?d=2ffadef8bb28bb335d56d5a83863fb8971aa8a175d1537f9&amp;t=634020843490000000"" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sel|0_0_1')"">Section</a></td>
-               </tr>
-
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr style=""height:0px;"">
-                       <td></td>
-               </tr><tr>
-                       <td><div style=""width:20px;height:1px;"">
-
-                       </div></td><td><a href=""javascript:__doPostBack('treeview1','ec|0_1')""><img alt=""Collapse Chapter"" src=""/WebResource.axd?d=2ffadef8bb28bb33bd311b2cae0874942ed83fb6bc74f1d5&amp;t=634020843490000000"" style=""border-width:0;"" /></a></td><td class=""TestCssClass2 treeview1_4"" style=""white-space:nowrap;""><a class=""treeview1_0 TestCssClass2 treeview1_3"" href=""javascript:__doPostBack('treeview1','sel|0_1')"">Chapter</a></td>
-               </tr><tr style=""height:0px;"">
-                       <td></td>
-
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px;"">
-
-                       </div></td><td><div style=""width:20px;height:1px;"">
-
-                       </div></td><td><img alt="""" src=""/WebResource.axd?d=2ffadef8bb28bb335d56d5a83863fb8971aa8a175d1537f9&amp;t=634020843490000000"" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sel|0_1_0')"">Section</a></td>
-               </tr>
-
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
 #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "Render_LevelStyle_CssClass");
@@ -850,11 +758,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        tv.RenderBeginTag (tw);
                        tv.RenderEndTag (tw);
                        string str = sw.ToString ();
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=kffkK8wYLPknq-W8AKNdNQ2&amp;t=632883840303269703\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#endif
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderTags");
                }
 
@@ -863,37 +767,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Method_ExpandAll () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadExpandAll));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t1\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t2\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t3\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t4\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t5\">Section</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t1"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t2"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t3"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t4"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t5"">Section</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "ExpandAll");
@@ -920,25 +794,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Method_NodeExpand () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadNodeExpand));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qsyBHMcxXXKbUwruYE_9Mo1&amp;t=634067491135766272\" alt=\"Expand Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t1\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qsyBHMcxXXKbUwruYE_9Mo1&amp;t=634067491135766272\" alt=\"Expand Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t4\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKww7ErebG7jw1jueqPriNXg1&amp;t=632900536532114160"" alt=""Expand Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t1"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKww7ErebG7jw1jueqPriNXg1&amp;t=632900536532114160"" alt=""Expand Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t4"">Chapter</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "NodeExpand");
@@ -966,17 +822,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Method_NodeExpandAll () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadNodeExpandAll));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qsyBHMcxXXKbUwruYE_9Mo1&amp;t=634067491135766272\" alt=\"Expand Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKww7ErebG7jw1jueqPriNXg1&amp;t=632900536532114160"" alt=""Expand Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "NodeExpandAll");
@@ -1004,17 +850,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Method_CollapseAll () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadCollapseAll));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qsyBHMcxXXKbUwruYE_9Mo1&amp;t=634067491135766272\" alt=\"Expand Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKww7ErebG7jw1jueqPriNXg1&amp;t=632900536532114160"" alt=""Expand Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "CollapseAll");
@@ -1041,17 +877,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Method_NodeCollapse () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadNodeCollapse));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qsyBHMcxXXKbUwruYE_9Mo1&amp;t=634067491135766272\" alt=\"Expand Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKww7ErebG7jw1jueqPriNXg1&amp;t=632900536532114160"" alt=""Expand Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "NodeCollapse");
@@ -1078,29 +904,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Method_NodeCollapseAll () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadNodeCollapseAll));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qsyBHMcxXXKbUwruYE_9Mo1&amp;t=634067491135766272\" alt=\"Expand Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t1\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t4\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t5\">Section</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKww7ErebG7jw1jueqPriNXg1&amp;t=632900536532114160"" alt=""Expand Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t1"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t4"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t5"">Section</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "NodeCollapseAll");
@@ -1127,33 +931,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Method_NodeToggleExpandState1 () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadNodeToggleExpandState1));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t1\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t2\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t3\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qsyBHMcxXXKbUwruYE_9Mo1&amp;t=634067491135766272\" alt=\"Expand Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t4\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t1"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t2"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t3"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKww7ErebG7jw1jueqPriNXg1&amp;t=632900536532114160"" alt=""Expand Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t4"">Chapter</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "NodeToggleExpandState1");
@@ -1180,17 +958,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Method_NodeToggleExpandState2 () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadNodeToggleExpandState2));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qsyBHMcxXXKbUwruYE_9Mo1&amp;t=634067491135766272\" alt=\"Expand Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKww7ErebG7jw1jueqPriNXg1&amp;t=632900536532114160"" alt=""Expand Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "NodeToggleExpandState2");
@@ -1304,25 +1072,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        PageInvoker invoker = new PageInvoker (delegates);
                        WebTest t = new WebTest (invoker);
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qsyBHMcxXXKbUwruYE_9Mo1&amp;t=634067491135766272\" alt=\"Expand Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t1\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qsyBHMcxXXKbUwruYE_9Mo1&amp;t=634067491135766272\" alt=\"Expand Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t4\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKww7ErebG7jw1jueqPriNXg1&amp;t=632900536532114160"" alt=""Expand Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t1"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKww7ErebG7jw1jueqPriNXg1&amp;t=632900536532114160"" alt=""Expand Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t4"">Chapter</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "NodeToggleExpandState2");
@@ -1380,25 +1130,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Render_Bindings () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadBindings));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook Title&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=9M_pBQelEbwLdXyZk6p9TZbZQJ7rAlJ-YkXM8P7PpIM1&amp;t=634067491135766272\" alt=\"Collapse Book Title\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook Title&#39;)\" id=\"treeview1t0\">Book Title</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=9M_pBQelEbwLdXyZk6p9TaTo2-lEuHkqGL9mwa70sVQ1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook Title\\\\Chapter 1&#39;)\" id=\"treeview1t1\">Chapter 1</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=9M_pBQelEbwLdXyZk6p9TaTo2-lEuHkqGL9mwa70sVQ1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook Title\\\\Chapter 2&#39;)\" id=\"treeview1t2\">Chapter 2</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook Title')""><img src=""/NunitWeb/WebResource.axd?d=tM_G_fTuPrZTezUsMMFtvPWfVVXMf-ioilxt_CauIRc1&amp;t=632900536532114160"" alt=""Collapse Book Title"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook Title')"" id=""treeview1t0"">Book Title</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=tM_G_fTuPrZTezUsMMFtvNJinrRt8LmxJBdwpNumnBQ1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook Title\\Chapter 1')"" id=""treeview1t1"">Chapter 1</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=tM_G_fTuPrZTezUsMMFtvNJinrRt8LmxJBdwpNumnBQ1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook Title\\Chapter 2')"" id=""treeview1t2"">Chapter 2</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderBindings");
@@ -1437,25 +1169,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Render_Navigate () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadNavigate));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tmyNode0&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse myNode0\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"myUrl0\" target=\"myTarget\" id=\"treeview1t0\">myNode0</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"myUrl00\" target=\"myTarget\" id=\"treeview1t1\">myNode00</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"myUrl1\" target=\"myTarget\" id=\"treeview1t2\">myNode1</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tmyNode0')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse myNode0"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""myUrl0"" target=""myTarget"" id=""treeview1t0"">myNode0</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""myUrl00"" target=""myTarget"" id=""treeview1t1"">myNode00</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""myUrl1"" target=""myTarget"" id=""treeview1t2"">myNode1</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderNavigate");
@@ -1487,37 +1201,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Render_Checkboxes () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadCheckboxes));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><input type=\"checkbox\" name=\"treeview1n0CheckBox\" id=\"treeview1n0CheckBox\" /><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><input type=\"checkbox\" name=\"treeview1n1CheckBox\" id=\"treeview1n1CheckBox\" /><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t1\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><input type=\"checkbox\" name=\"treeview1n2CheckBox\" id=\"treeview1n2CheckBox\" /><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t2\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><input type=\"checkbox\" name=\"treeview1n3CheckBox\" id=\"treeview1n3CheckBox\" /><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t3\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><input type=\"checkbox\" name=\"treeview1n4CheckBox\" id=\"treeview1n4CheckBox\" /><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t4\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><input type=\"checkbox\" name=\"treeview1n5CheckBox\" id=\"treeview1n5CheckBox\" /><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t5\">Section</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><input type=""checkbox"" name=""treeview1n0CheckBox"" id=""treeview1n0CheckBox"" title=""Book"" /><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><input type=""checkbox"" name=""treeview1n1CheckBox"" id=""treeview1n1CheckBox"" title=""Chapter"" /><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t1"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><input type=""checkbox"" name=""treeview1n2CheckBox"" id=""treeview1n2CheckBox"" title=""Section"" /><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t2"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><input type=""checkbox"" name=""treeview1n3CheckBox"" id=""treeview1n3CheckBox"" title=""Section"" /><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t3"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><input type=""checkbox"" name=""treeview1n4CheckBox"" id=""treeview1n4CheckBox"" title=""Chapter"" /><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t4"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><input type=""checkbox"" name=""treeview1n5CheckBox"" id=""treeview1n5CheckBox"" title=""Section"" /><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t5"">Section</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderCheckboxes");
@@ -1545,37 +1229,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Render_Values () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadValues));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"mySkipLinkText\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=9M_pBQelEbwLdXyZk6p9TZbZQJ7rAlJ-YkXM8P7PpIM1&amp;t=634067491135766272\" alt=\"Collapse Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:30px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=9M_pBQelEbwLdXyZk6p9TZbZQJ7rAlJ-YkXM8P7PpIM1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t1\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:30px;height:1px\"></div></td><td><div style=\"width:30px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=9M_pBQelEbwLdXyZk6p9TaTo2-lEuHkqGL9mwa70sVQ1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t2\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:30px;height:1px\"></div></td><td><div style=\"width:30px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=9M_pBQelEbwLdXyZk6p9TaTo2-lEuHkqGL9mwa70sVQ1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t3\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:30px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=9M_pBQelEbwLdXyZk6p9TZbZQJ7rAlJ-YkXM8P7PpIM1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t4\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:30px;height:1px\"></div></td><td><div style=\"width:30px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=9M_pBQelEbwLdXyZk6p9TaTo2-lEuHkqGL9mwa70sVQ1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t5\">Section</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""mySkipLinkText"" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=tM_G_fTuPrZTezUsMMFtvPWfVVXMf-ioilxt_CauIRc1&amp;t=632900536532114160"" alt=""Collapse Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:30px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=tM_G_fTuPrZTezUsMMFtvPWfVVXMf-ioilxt_CauIRc1&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t1"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:30px;height:1px""></div></td><td><div style=""width:30px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=tM_G_fTuPrZTezUsMMFtvNJinrRt8LmxJBdwpNumnBQ1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t2"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:30px;height:1px""></div></td><td><div style=""width:30px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=tM_G_fTuPrZTezUsMMFtvNJinrRt8LmxJBdwpNumnBQ1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t3"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:30px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=tM_G_fTuPrZTezUsMMFtvPWfVVXMf-ioilxt_CauIRc1&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t4"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:30px;height:1px""></div></td><td><div style=""width:30px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=tM_G_fTuPrZTezUsMMFtvNJinrRt8LmxJBdwpNumnBQ1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t5"">Section</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderValues");
@@ -1606,37 +1260,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Render_ImagesOn () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadImagesOn));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"Test666/dashminus.gif\" alt=\"Test111\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"Test666/tminus.gif\" alt=\"Test111\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t1\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"><img src=\"Test666/i.gif\" alt=\"\" /></div></td><td><img src=\"Test666/t.gif\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t2\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"><img src=\"Test666/i.gif\" alt=\"\" /></div></td><td><img src=\"Test666/l.gif\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t3\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"Test666/lminus.gif\" alt=\"Test111\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t4\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"Test666/l.gif\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t5\">Section</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""Test666/dashminus.gif"" alt=""Test111"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""Test666/tminus.gif"" alt=""Test111"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t1"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""><img src=""Test666/i.gif"" alt="""" /></div></td><td><img src=""Test666/t.gif"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t2"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""><img src=""Test666/i.gif"" alt="""" /></div></td><td><img src=""Test666/l.gif"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t3"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""Test666/lminus.gif"" alt=""Test111"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t4"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""Test666/l.gif"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t5"">Section</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderImagesOn");
@@ -1646,37 +1270,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Render_ImagesOff () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadImagesOff));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1n0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1n1\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1n2\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1n3\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1n4\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1n5\">Section</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1n0"">Book</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1n1"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1n2"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1n3"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1n4"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1n5"">Section</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderImagesOff");
@@ -1728,18 +1322,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Category ("NunitWeb")]
                public void TreeView_Render_WrapOn () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadWrapOn));
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sTreeNode1&#39;)\" onclick=\"TreeView_SelectNode(treeview1_Data, this,&#39;treeview1t0&#39;);\" id=\"treeview1t0\">TreeNode1</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget =
-@"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=kffkK8wYLPknq-W8AKNdNQ2&amp;t=632883840303269703"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><img src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zZhMbc1ZCZv4nlS9J-l53l41&amp;t=632883840303269703"" alt="""" /></td><td><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sTreeNode1')"" onclick=""TreeView_SelectNode(treeview1_Data, this,'treeview1t0');"" id=""treeview1t0"">TreeNode1</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderWrapOn");
                }
@@ -1747,18 +1330,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Category ("NunitWeb")]
                public void TreeView_Render_WrapOff () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadWrapOff));
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sTreeNode1&#39;)\" onclick=\"TreeView_SelectNode(treeview1_Data, this,&#39;treeview1t0&#39;);\" id=\"treeview1t0\">TreeNode1</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget =
-@"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=kffkK8wYLPknq-W8AKNdNQ2&amp;t=632883840303269703"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><img src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zZhMbc1ZCZv4nlS9J-l53l41&amp;t=632883840303269703"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sTreeNode1')"" onclick=""TreeView_SelectNode(treeview1_Data, this,'treeview1t0');"" id=""treeview1t0"">TreeNode1</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderWrapOff");
                }
@@ -1792,11 +1364,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                [Category ("NunitWeb")]
                public void TreeView_Render_Client () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadClient));
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=kffkK8wYLPknq-W8AKNdNQ2&amp;t=632883840303269703\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#endif
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderClient");
                }
@@ -1843,37 +1411,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Render_NodeStrings () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadNodeStrings));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" title=\"string1\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td><a href=\"string4\" id=\"treeview1t1i\" tabindex=\"-1\"><img src=\"string3\" alt=\"\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"string4\" id=\"treeview1t1\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t2\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\string6&#39;)\" id=\"treeview1t3\">string6</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\string7&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\string7&#39;)\" id=\"treeview1t4\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\string7\\\\Section&#39;)\" id=\"treeview1t5\">Section</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" title=""string1"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td><a href=""string4"" id=""treeview1t1i""><img src=""string3"" alt="""" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""string4"" id=""treeview1t1"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t2"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\string6')"" id=""treeview1t3"">string6</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\string7')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\string7')"" id=""treeview1t4"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\string7\\Section')"" id=""treeview1t5"">Section</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderNodeStrings");
@@ -1907,37 +1445,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Render_NodeStates1 () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadNodeStates1));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t1\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t2\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><input type=\"checkbox\" name=\"treeview1n3CheckBox\" id=\"treeview1n3CheckBox\" /><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t3\">Section</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t4\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t5\">Section</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t1"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t2"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><input type=""checkbox"" name=""treeview1n3CheckBox"" id=""treeview1n3CheckBox"" title=""Section"" /><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t3"">Section</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t4"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t5"">Section</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderNodeStates1");
@@ -1969,29 +1477,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                public void TreeView_Render_NodeStates2 () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad (pageLoadNodeStates2));
                        #region HTML
-#if NET_4_0
                        string strTarget = "<a href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Book\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook&#39;)\" id=\"treeview1t0\">Book</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qsyBHMcxXXKbUwruYE_9Mo1&amp;t=634067491135766272\" alt=\"Expand Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t1\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><a href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;tBook\\\\Chapter&#39;)\"><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2qLe7WfoYyDfWfVSkV5Suzs1&amp;t=634067491135766272\" alt=\"Collapse Chapter\" style=\"border-width:0;\" /></a></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter&#39;)\" id=\"treeview1t4\">Chapter</a></td>\r\n\t\t</tr>\r\n\t</table><table cellpadding=\"0\" cellspacing=\"0\" style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><div style=\"width:20px;height:1px\"></div></td><td><div style=\"width:20px;height:1px\"></div></td><td><img src=\"/NunitWeb/WebResource.axd?d=Me-CdxEHiTTT3lXTDd0I2ilpe6vhhhJjssENmbNkrSY1&amp;t=634067491135766272\" alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"javascript:__doPostBack(&#39;treeview1&#39;,&#39;sBook\\\\Chapter\\\\Section&#39;)\" id=\"treeview1t5\">Section</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a id=\"treeview1_SkipLink\"></a>";
-#else
-                       string strTarget = @"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""treeview1"">
-       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><a href=""javascript:__doPostBack('treeview1','tBook')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Book"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook')"" id=""treeview1t0"">Book</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKww7ErebG7jw1jueqPriNXg1&amp;t=632900536532114160"" alt=""Expand Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t1"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><a href=""javascript:__doPostBack('treeview1','tBook\\Chapter')""><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160"" alt=""Collapse Chapter"" style=""border-width:0;"" /></a></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter')"" id=""treeview1t4"">Chapter</a></td>
-               </tr>
-       </table><table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
-               <tr>
-                       <td><div style=""width:20px;height:1px""></div></td><td><div style=""width:20px;height:1px""></div></td><td><img src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160"" alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" href=""javascript:__doPostBack('treeview1','sBook\\Chapter\\Section')"" id=""treeview1t5"">Section</a></td>
-               </tr>
-       </table>
-</div><a id=""treeview1_SkipLink""></a>";
-#endif
                        #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, "RenderNodeStates2");

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ValidationSummaryTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ValidationSummaryTest.cs
index 7c5e7530fa2ebbba8cf8f9f07943a459c7c2dfa4..4f43e8e142105e8399d805cf45901bc64ae2e486 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ValidationSummaryTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ValidationSummaryTest.cs
@@ -270,7 +270,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
                        StopValidationTest();
                }
-#if NET_4_0
                [Test]
                public void SupportsDisabledAttribute ()
                {
@@ -284,6 +283,5 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.AreEqual (ver35, p.RenderingCompatibility, "#A2-1");
                        Assert.IsTrue (p.SupportsDisabledAttribute, "#A2-2");
                }
-#endif
        }
 }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardStepBaseTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardStepBaseTest.cs
index ceb2dad584d0af94b253cc96b8f8951c939d6f26..03f41d9dbbcd1fe97a89f46d05a66dc16e53ce3a 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardStepBaseTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardStepBaseTest.cs
@@ -215,11 +215,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        // This render test include Title property test 
                        string html = new WebTest (PageInvoker.CreateOnLoad (
                                new PageDelegate (Render_Test))).Run ();
-#if NET_4_0
                        string origin = "<table cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"height:100%;\"><a href=\"#ctl01_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" style=\"border-width:0px;\" /></a><table id=\"ctl01_SideBarContainer_SideBarList\" cellspacing=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td style=\"font-weight:bold;\"><a id=\"ctl01_SideBarContainer_SideBarList_SideBarButton_0\" href=\"javascript:__doPostBack(&#39;ctl01$SideBarContainer$SideBarList$ctl00$SideBarButton&#39;,&#39;&#39;)\">my_title</a></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><a id=\"ctl01_SideBarContainer_SideBarList_SideBarButton_1\" href=\"javascript:__doPostBack(&#39;ctl01$SideBarContainer$SideBarList$ctl01$SideBarButton&#39;,&#39;&#39;)\">my_title_2</a></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl01_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td>123</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl01$StartNavigationTemplateContainerID$StartNextButton\" value=\"Next\" id=\"ctl01_StartNavigationTemplateContainerID_StartNextButton\" /></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origin = "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"height:100%;\"><a href=\"#ctl01_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=4RHYfeNnynkXiM59uthjZg2&amp;t=633802729995006876\" style=\"border-width:0px;\" /></a><table id=\"ctl01_SideBarContainer_SideBarList\" cellspacing=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td style=\"font-weight:bold;\"><a id=\"ctl01_SideBarContainer_SideBarList_ctl00_SideBarButton\" href=\"javascript:__doPostBack('ctl01$SideBarContainer$SideBarList$ctl00$SideBarButton','')\">my_title</a></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><a id=\"ctl01_SideBarContainer_SideBarList_ctl01_SideBarButton\" href=\"javascript:__doPostBack('ctl01$SideBarContainer$SideBarList$ctl01$SideBarButton','')\">my_title_2</a></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl01_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td>123</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\" border=\"0\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl01$StartNavigationTemplateContainerID$StartNextButton\" value=\"Next\" id=\"ctl01_StartNavigationTemplateContainerID_StartNextButton\" /></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (html);
                        HtmlDiff.AssertAreEqual (origin, renderedHtml, "BaseRender");
                        if (html.IndexOf ("my_title") < 0)

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardTest.cs
index 03a3921653f9278630c5eea8a1416fa633a7b61f..f81a3a88c417780c6dde98e78fdd905df141cdb8 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardTest.cs
@@ -300,7 +300,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        base.EnsureChildControls ();
                }
        }
-#if NET_4_0
        class TestHeaderSpan : WebControl
        {
                public TestHeaderSpan ()
@@ -360,7 +359,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        return ctl;
                }
        }
-#endif
        [TestFixture]
        public class WizardTest
        {
@@ -374,12 +372,10 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.AreEqual ("MoveNext", Wizard.MoveNextCommandName, "MoveNextCommandName");
                        Assert.AreEqual ("MovePrevious", Wizard.MovePreviousCommandName, "MovePreviousCommandName");
                        Assert.AreEqual ("Move", Wizard.MoveToCommandName, "MoveToCommandName");
-#if NET_4_0
                        Assert.AreEqual ("headerPlaceholder", Wizard.HeaderPlaceholderId, "HeaderPlaceHolderId");
                        Assert.AreEqual ("navigationPlaceholder", Wizard.NavigationPlaceholderId, "NavigationPlaceHolderId");
                        Assert.AreEqual ("sideBarPlaceholder", Wizard.SideBarPlaceholderId, "SidePlaceholderId");
                        Assert.AreEqual ("wizardStepPlaceholder", Wizard.WizardStepPlaceholderId, "WizardStepPlaceholderId");
-#endif
                        // Protected Fields 
                        Assert.AreEqual ("CancelButton", PokerWizard.PokerCancelButtonID, "CancelButtonID");
                        Assert.AreEqual ("CustomFinishButton", PokerWizard.PokerCustomFinishButtonID, "CustomFinishButtonID");
@@ -539,11 +535,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        WebTest t = new WebTest (PageInvoker.CreateOnPreInit (_CancelButtonPropertyRendering));
                        string html = t.Run ();
-#if NET_4_0
                        string origin = "<table cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr style=\"height:100%;\">\r\n\t\t<td>Start</td>\r\n\t</tr><tr>\r\n\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$StartNavigationTemplateContainerID$StartNextButton\" value=\"Next\" id=\"ctl00_StartNavigationTemplateContainerID_StartNextButton\" /></td><td align=\"right\"><input type=\"submit\" name=\"ctl00$StartNavigationTemplateContainerID$CancelButton\" value=\"CancelButtonText\" id=\"ctl00_StartNavigationTemplateContainerID_CancelButton\" style=\"border-color:Red;\" /></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origin = "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr style=\"height:100%;\">\r\n\t\t<td>Start</td>\r\n\t</tr><tr>\r\n\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\" border=\"0\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$StartNavigationTemplateContainerID$StartNextButton\" value=\"Next\" id=\"ctl00_StartNavigationTemplateContainerID_StartNextButton\" /></td><td align=\"right\"><input type=\"submit\" name=\"ctl00$StartNavigationTemplateContainerID$CancelButton\" value=\"CancelButtonText\" id=\"ctl00_StartNavigationTemplateContainerID_CancelButton\" style=\"border-color:Red;\" /></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (html);
                        HtmlDiff.AssertAreEqual (origin, renderedHtml, "CancelButtonPropertyRendering");
                }
@@ -585,11 +577,7 @@ namespace MonoTests.System.Web.UI.WebControls
 
                        WebTest t = new WebTest (PageInvoker.CreateOnPreInit (_FinishButtonPropertyRendering));
                        string html = t.Run ();
-#if NET_4_0
                        string origin = "<table cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr style=\"height:100%;\">\r\n\t\t<td>Finish</td>\r\n\t</tr><tr>\r\n\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td align=\"right\"><input type=\"image\" name=\"ctl00$FinishNavigationTemplateContainerID$FinishPreviousImageButton\" id=\"ctl00_FinishNavigationTemplateContainerID_FinishPreviousImageButton\" src=\"http://FinishPreviousButtonImageUrl\" alt=\"FinishPreviousButtonText\" style=\"background-color:Red;\" /></td><td align=\"right\"><a id=\"ctl00_FinishNavigationTemplateContainerID_FinishLinkButton\" href=\"javascript:__doPostBack(&#39;ctl00$FinishNavigationTemplateContainerID$FinishLinkButton&#39;,&#39;&#39;)\" style=\"border-color:Red;\">FinishCompleteButtonText</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else                  
-                       string origin = "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr style=\"height:100%;\">\r\n\t\t<td>Finish</td>\r\n\t</tr><tr>\r\n\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\" border=\"0\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td align=\"right\"><input type=\"image\" name=\"ctl00$FinishNavigationTemplateContainerID$FinishPreviousImageButton\" id=\"ctl00_FinishNavigationTemplateContainerID_FinishPreviousImageButton\" src=\"http://FinishPreviousButtonImageUrl\" alt=\"FinishPreviousButtonText\" style=\"background-color:Red;border-width:0px;\" /></td><td align=\"right\"><a id=\"ctl00_FinishNavigationTemplateContainerID_FinishLinkButton\" href=\"javascript:__doPostBack('ctl00$FinishNavigationTemplateContainerID$FinishLinkButton','')\" style=\"border-color:Red;\">FinishCompleteButtonText</a></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (html);
                        HtmlDiff.AssertAreEqual (origin, renderedHtml, "CancelButtonPropertyRendering");
                }
@@ -634,11 +622,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        WebTest t = new WebTest (PageInvoker.CreateOnPreInit (_HeaderRendering));
                        string html = t.Run ();
-#if NET_4_0
                        string origin = "<table cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"background-color:Red;\"><input name=\"ctl00$HeaderContainer$TextBox1\" type=\"text\" id=\"ctl00_HeaderContainer_TextBox1\" /></td>\r\n\t</tr><tr style=\"height:100%;\">\r\n\t\t<td>Finish</td>\r\n\t</tr><tr>\r\n\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$FinishNavigationTemplateContainerID$FinishPreviousButton\" value=\"Previous\" id=\"ctl00_FinishNavigationTemplateContainerID_FinishPreviousButton\" /></td><td align=\"right\"><input type=\"submit\" name=\"ctl00$FinishNavigationTemplateContainerID$FinishButton\" value=\"Finish\" id=\"ctl00_FinishNavigationTemplateContainerID_FinishButton\" /></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origin = "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"background-color:Red;\"><input name=\"ctl00$HeaderContainer$TextBox1\" type=\"text\" id=\"ctl00_HeaderContainer_TextBox1\" /></td>\r\n\t</tr><tr style=\"height:100%;\">\r\n\t\t<td>Finish</td>\r\n\t</tr><tr>\r\n\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\" border=\"0\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$FinishNavigationTemplateContainerID$FinishPreviousButton\" value=\"Previous\" id=\"ctl00_FinishNavigationTemplateContainerID_FinishPreviousButton\" /></td><td align=\"right\"><input type=\"submit\" name=\"ctl00$FinishNavigationTemplateContainerID$FinishButton\" value=\"Finish\" id=\"ctl00_FinishNavigationTemplateContainerID_FinishButton\" /></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (html);
                        HtmlDiff.AssertAreEqual (origin, renderedHtml, "HeaderRendering");
                }
@@ -685,11 +669,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        WebTest t = new WebTest (PageInvoker.CreateOnPreInit (_SideBarRendering));
                        string html = t.Run ();
-#if NET_4_0
                        string origin = "<table cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"background-color:Red;height:100%;\"><a href=\"#ctl00_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" style=\"border-width:0px;\" /></a><table id=\"ctl00_SideBarContainer_SideBarList\" cellspacing=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td><input type=\"button\" name=\"ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton\" value=\"step1\" onclick=\"javascript:__doPostBack(&#39;ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton&#39;,&#39;&#39;)\" id=\"ctl00_SideBarContainer_SideBarList_SideBarButton_0\" /></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><input type=\"button\" name=\"ctl00$SideBarContainer$SideBarList$ctl01$SideBarButton\" value=\"step2\" onclick=\"javascript:__doPostBack(&#39;ctl00$SideBarContainer$SideBarList$ctl01$SideBarButton&#39;,&#39;&#39;)\" id=\"ctl00_SideBarContainer_SideBarList_SideBarButton_1\" /></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl00_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td>Step 1</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$StartNavigationTemplateContainerID$StartNextButton\" value=\"Next\" id=\"ctl00_StartNavigationTemplateContainerID_StartNextButton\" /></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origin = "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"background-color:Red;height:100%;\"><a href=\"#ctl00_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=4RHYfeNnynkXiM59uthjZg2&amp;t=633802729995006876\" style=\"border-width:0px;\" /></a><table id=\"ctl00_SideBarContainer_SideBarList\" cellspacing=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td><input type=\"button\" name=\"ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton\" value=\"step1\" onclick=\"javascript:__doPostBack('ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton','')\" id=\"ctl00_SideBarContainer_SideBarList_ctl00_SideBarButton\" /></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><input type=\"button\" name=\"ctl00$SideBarContainer$SideBarList$ctl01$SideBarButton\" value=\"step2\" onclick=\"javascript:__doPostBack('ctl00$SideBarContainer$SideBarList$ctl01$SideBarButton','')\" id=\"ctl00_SideBarContainer_SideBarList_ctl01_SideBarButton\" /></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl00_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td>Step 1</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\" border=\"0\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$StartNavigationTemplateContainerID$StartNextButton\" value=\"Next\" id=\"ctl00_StartNavigationTemplateContainerID_StartNextButton\" /></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (html);
                        HtmlDiff.AssertAreEqual (origin, renderedHtml, "SideBarRendering");
                }
@@ -742,11 +722,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        WebTest t = new WebTest (PageInvoker.CreateOnPreInit (_NavigationRendering));
                        string html = t.Run ();
-#if NET_4_0
                        string origin = "<table cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"height:100%;\"><a href=\"#ctl00_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" style=\"border-width:0px;\" /></a><table id=\"ctl00_SideBarContainer_SideBarList\" cellspacing=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td style=\"font-weight:bold;\"><a id=\"ctl00_SideBarContainer_SideBarList_SideBarButton_0\" href=\"javascript:__doPostBack(&#39;ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton&#39;,&#39;&#39;)\">step1</a></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><a id=\"ctl00_SideBarContainer_SideBarList_SideBarButton_1\" href=\"javascript:__doPostBack(&#39;ctl00$SideBarContainer$SideBarList$ctl01$SideBarButton&#39;,&#39;&#39;)\">step2</a></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl00_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td>Start</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\" style=\"background-color:Yellow;\"><table cellspacing=\"5\" cellpadding=\"5\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$StartNavigationTemplateContainerID$StartNextButton\" value=\"Next\" id=\"ctl00_StartNavigationTemplateContainerID_StartNextButton\" style=\"background-color:Red;\" /></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origin = "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"height:100%;\"><a href=\"#ctl00_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=4RHYfeNnynkXiM59uthjZg2&amp;t=633802729995006876\" style=\"border-width:0px;\" /></a><table id=\"ctl00_SideBarContainer_SideBarList\" cellspacing=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td style=\"font-weight:bold;\"><a id=\"ctl00_SideBarContainer_SideBarList_ctl00_SideBarButton\" href=\"javascript:__doPostBack('ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton','')\">step1</a></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><a id=\"ctl00_SideBarContainer_SideBarList_ctl01_SideBarButton\" href=\"javascript:__doPostBack('ctl00$SideBarContainer$SideBarList$ctl01$SideBarButton','')\">step2</a></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl00_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td>Start</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\" style=\"background-color:Yellow;\"><table cellspacing=\"5\" cellpadding=\"5\" border=\"0\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$StartNavigationTemplateContainerID$StartNextButton\" value=\"Next\" id=\"ctl00_StartNavigationTemplateContainerID_StartNextButton\" style=\"background-color:Red;\" /></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (html);
                        HtmlDiff.AssertAreEqual (origin, renderedHtml, "NavigationRendering");
                }
@@ -783,11 +759,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        WebTest t = new WebTest (PageInvoker.CreateOnPreInit (_StartTypeRendering));
                        string html = t.Run ();
-#if NET_4_0
                        string origin = "<table cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"height:100%;\"><a href=\"#ctl00_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" style=\"border-width:0px;\" /></a><table id=\"ctl00_SideBarContainer_SideBarList\" cellspacing=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td style=\"font-weight:bold;\"><a id=\"ctl00_SideBarContainer_SideBarList_SideBarButton_0\" href=\"javascript:__doPostBack(&#39;ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton&#39;,&#39;&#39;)\">step1</a></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><a id=\"ctl00_SideBarContainer_SideBarList_SideBarButton_1\" href=\"javascript:__doPostBack(&#39;ctl00$SideBarContainer$SideBarList$ctl01$SideBarButton&#39;,&#39;&#39;)\">step2</a></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl00_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td>Start</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$StartNavigationTemplateContainerID$StartNextButton\" value=\"StartNextButtonText\" id=\"ctl00_StartNavigationTemplateContainerID_StartNextButton\" style=\"background-color:Red;\" /></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origin = "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"height:100%;\"><a href=\"#ctl00_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=4RHYfeNnynkXiM59uthjZg2&amp;t=633802729995006876\" style=\"border-width:0px;\" /></a><table id=\"ctl00_SideBarContainer_SideBarList\" cellspacing=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td style=\"font-weight:bold;\"><a id=\"ctl00_SideBarContainer_SideBarList_ctl00_SideBarButton\" href=\"javascript:__doPostBack('ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton','')\">step1</a></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><a id=\"ctl00_SideBarContainer_SideBarList_ctl01_SideBarButton\" href=\"javascript:__doPostBack('ctl00$SideBarContainer$SideBarList$ctl01$SideBarButton','')\">step2</a></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl00_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td>Start</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\" border=\"0\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$StartNavigationTemplateContainerID$StartNextButton\" value=\"StartNextButtonText\" id=\"ctl00_StartNavigationTemplateContainerID_StartNextButton\" style=\"background-color:Red;\" /></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (html);
                        HtmlDiff.AssertAreEqual (origin, renderedHtml, "StartTypeRendering");
                }
@@ -826,11 +798,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        WebTest t = new WebTest (PageInvoker.CreateOnPreInit (_StartTemplateRendering));
                        string html = t.Run ();
-#if NET_4_0
                        string origin = "<table cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"height:100%;\"><a href=\"#ctl00_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" style=\"border-width:0px;\" /></a><table id=\"ctl00_SideBarContainer_SideBarList\" cellspacing=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td style=\"font-weight:bold;\"><a id=\"ctl00_SideBarContainer_SideBarList_SideBarButton_0\" href=\"javascript:__doPostBack(&#39;ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton&#39;,&#39;&#39;)\">step1</a></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl00_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td>Start</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$StartNavigationTemplateContainerID$SideBarButton\" value=\"\" id=\"ctl00_StartNavigationTemplateContainerID_SideBarButton\" style=\"background-color:Red;\" /></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origin = "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"height:100%;\"><a href=\"#ctl00_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=4RHYfeNnynkXiM59uthjZg2&amp;t=633802729995006876\" style=\"border-width:0px;\" /></a><table id=\"ctl00_SideBarContainer_SideBarList\" cellspacing=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td style=\"font-weight:bold;\"><a id=\"ctl00_SideBarContainer_SideBarList_ctl00_SideBarButton\" href=\"javascript:__doPostBack('ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton','')\">step1</a></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl00_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td>Start</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$StartNavigationTemplateContainerID$SideBarButton\" value=\"\" id=\"ctl00_StartNavigationTemplateContainerID_SideBarButton\" style=\"background-color:Red;\" /></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (html);
                        HtmlDiff.AssertAreEqual (origin, renderedHtml, "StartTemplateRendering");
                }
@@ -868,11 +836,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        WebTest t = new WebTest (PageInvoker.CreateOnPreInit (_StepTypeRendering));
                        string html = t.Run ();
-#if NET_4_0
                        string origin = "<table cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"height:100%;\"><a href=\"#ctl00_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" style=\"border-width:0px;\" /></a><table id=\"ctl00_SideBarContainer_SideBarList\" cellspacing=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td><a id=\"ctl00_SideBarContainer_SideBarList_SideBarButton_0\" href=\"javascript:__doPostBack(&#39;ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton&#39;,&#39;&#39;)\">step1</a></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td style=\"font-weight:bold;\"><a id=\"ctl00_SideBarContainer_SideBarList_SideBarButton_1\" href=\"javascript:__doPostBack(&#39;ctl00$SideBarContainer$SideBarList$ctl01$SideBarButton&#39;,&#39;&#39;)\">step2</a></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><a id=\"ctl00_SideBarContainer_SideBarList_SideBarButton_2\" href=\"javascript:__doPostBack(&#39;ctl00$SideBarContainer$SideBarList$ctl02$SideBarButton&#39;,&#39;&#39;)\">step3</a></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl00_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td style=\"background-color:Red;\">Step2</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td align=\"right\"><a id=\"ctl00_StepNavigationTemplateContainerID_StepPreviousLinkButton\" href=\"javascript:__doPostBack(&#39;ctl00$StepNavigationTemplateContainerID$StepPreviousLinkButton&#39;,&#39;&#39;)\" style=\"background-color:Red;\">StepPreviousButtonText</a></td><td align=\"right\"><input type=\"image\" name=\"ctl00$StepNavigationTemplateContainerID$StepNextImageButton\" id=\"ctl00_StepNavigationTemplateContainerID_StepNextImageButton\" src=\"http://StepNextButtonImageUrl\" alt=\"StepNextButtonText\" style=\"background-color:Red;\" /></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origin = "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"height:100%;\"><a href=\"#ctl00_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=4RHYfeNnynkXiM59uthjZg2&amp;t=633802729995006876\" style=\"border-width:0px;\" /></a><table id=\"ctl00_SideBarContainer_SideBarList\" cellspacing=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td><a id=\"ctl00_SideBarContainer_SideBarList_ctl00_SideBarButton\" href=\"javascript:__doPostBack('ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton','')\">step1</a></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td style=\"font-weight:bold;\"><a id=\"ctl00_SideBarContainer_SideBarList_ctl01_SideBarButton\" href=\"javascript:__doPostBack('ctl00$SideBarContainer$SideBarList$ctl01$SideBarButton','')\">step2</a></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><a id=\"ctl00_SideBarContainer_SideBarList_ctl02_SideBarButton\" href=\"javascript:__doPostBack('ctl00$SideBarContainer$SideBarList$ctl02$SideBarButton','')\">step3</a></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl00_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td style=\"background-color:Red;\">Step2</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\" border=\"0\">\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t<td align=\"right\"><a id=\"ctl00_StepNavigationTemplateContainerID_StepPreviousLinkButton\" href=\"javascript:__doPostBack('ctl00$StepNavigationTemplateContainerID$StepPreviousLinkButton','')\" style=\"background-color:Red;\">StepPreviousButtonText</a></td><td align=\"right\"><input type=\"image\" name=\"ctl00$StepNavigationTemplateContainerID$StepNextImageButton\" id=\"ctl00_StepNavigationTemplateContainerID_StepNextImageButton\" src=\"http://StepNextButtonImageUrl\" alt=\"StepNextButtonText\" style=\"background-color:Red;border-width:0px;\" /></td>\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t</table></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (html);
                        HtmlDiff.AssertAreEqual (origin, renderedHtml, "StepRendering");
                }
@@ -924,11 +888,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        WebTest t = new WebTest (PageInvoker.CreateOnPreInit (_StepNavigationTemplate));
                        string html = t.Run ();
-#if NET_4_0
                        string origin = "<table cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"height:100%;\"><a href=\"#ctl00_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=8VpphgAbakKUC_J8R6hR0Q2&amp;t=634067491135766272\" style=\"border-width:0px;\" /></a><table id=\"ctl00_SideBarContainer_SideBarList\" cellspacing=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td style=\"font-weight:bold;\"><a id=\"ctl00_SideBarContainer_SideBarList_SideBarButton_0\" href=\"javascript:__doPostBack(&#39;ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton&#39;,&#39;&#39;)\">step1</a></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><a id=\"ctl00_SideBarContainer_SideBarList_SideBarButton_1\" href=\"javascript:__doPostBack(&#39;ctl00$SideBarContainer$SideBarList$ctl01$SideBarButton&#39;,&#39;&#39;)\">step2</a></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl00_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td>Step1</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$StepNavigationTemplateContainerID$SideBarButton\" value=\"\" id=\"ctl00_StepNavigationTemplateContainerID_SideBarButton\" style=\"background-color:Red;\" />Test text</td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origin = "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr>\r\n\t\t<td style=\"height:100%;\"><a href=\"#ctl00_SkipLink\"><img alt=\"Skip Navigation Links.\" height=\"0\" width=\"0\" src=\"/NunitWeb/WebResource.axd?d=4RHYfeNnynkXiM59uthjZg2&amp;t=633802729995006876\" style=\"border-width:0px;\" /></a><table id=\"ctl00_SideBarContainer_SideBarList\" cellspacing=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td style=\"font-weight:bold;\"><a id=\"ctl00_SideBarContainer_SideBarList_ctl00_SideBarButton\" href=\"javascript:__doPostBack('ctl00$SideBarContainer$SideBarList$ctl00$SideBarButton','')\">step1</a></td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td><a id=\"ctl00_SideBarContainer_SideBarList_ctl01_SideBarButton\" href=\"javascript:__doPostBack('ctl00$SideBarContainer$SideBarList$ctl01$SideBarButton','')\">step2</a></td>\r\n\t\t\t</tr>\r\n\t\t</table><a id=\"ctl00_SkipLink\"></a></td><td style=\"height:100%;\"><table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"height:100%;width:100%;border-collapse:collapse;\">\r\n\t\t\t<tr style=\"height:100%;\">\r\n\t\t\t\t<td>Step1</td>\r\n\t\t\t</tr><tr>\r\n\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$StepNavigationTemplateContainerID$SideBarButton\" value=\"\" id=\"ctl00_StepNavigationTemplateContainerID_SideBarButton\" style=\"background-color:Red;\" />Test text</td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (html);
                        HtmlDiff.AssertAreEqual (origin, renderedHtml, "StepNavigationTemplateRendering");
                }
@@ -1443,11 +1403,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        string html = new WebTest (PageInvoker.CreateOnPreInit (
                                new PageDelegate (WizardPreInit))).Run ();
-#if NET_4_0
                        string origHtml = "<table cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr style=\"height:100%;\">\r\n\t\t<td>123</td>\r\n\t</tr><tr>\r\n\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$FinishNavigationTemplateContainerID$FinishButton\" value=\"Finish\" id=\"ctl00_FinishNavigationTemplateContainerID_FinishButton\" /></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#else
-                       string origHtml = "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"border-collapse:collapse;\">\r\n\t<tr style=\"height:100%;\">\r\n\t\t<td>123</td>\r\n\t</tr><tr>\r\n\t\t<td align=\"right\"><table cellspacing=\"5\" cellpadding=\"5\" border=\"0\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td align=\"right\"><input type=\"submit\" name=\"ctl00$FinishNavigationTemplateContainerID$FinishButton\" value=\"Finish\" id=\"ctl00_FinishNavigationTemplateContainerID_FinishButton\" /></td>\r\n\t\t\t</tr>\r\n\t\t</table></td>\r\n\t</tr>\r\n</table>";
-#endif
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (html);
                        HtmlDiff.AssertAreEqual (origHtml, renderedHtml, "BaseRender");
                }
@@ -1530,7 +1486,6 @@ namespace MonoTests.System.Web.UI.WebControls
                                Assert.Fail ("FinishButtonNotCreated");
                        Assert.AreEqual (-1, result.IndexOf ("Next"), "NextButtonCreatedOnLastPage");
                }
-#if NET_4_0
                [Test]
                public void Wizard_LayoutTemplate ()
                {
@@ -1752,7 +1707,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
                        w.WizardSteps.Add (ws);
                }
-#endif
                [Test]
                [Category ("NunitWeb")]
                public void Wizard_RenderTestCompleteItem ()

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/XmlDataSourceTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/XmlDataSourceTest.cs
index d5dfbac45807fb3c076bb08f921e9e45cc25e16a..2d845ac32df76bd0b0482e0fd5f9dbfd4c34934b 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/XmlDataSourceTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/XmlDataSourceTest.cs
@@ -462,7 +462,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        DSPoker p = new DSPoker ();
                        p.GetXmlDocument ();
                }
-#if NET_4_0
                [Test]
                public void CacheKeyContext ()
                {
@@ -474,7 +473,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        xds.CacheKeyContext = "MyKey";
                        Assert.AreEqual ("MyKey", xds.CacheKeyContext, "#A1");
                }
-#endif
                [TestFixtureTearDown]
                public void TearDown ()
                {

diff --git a/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs b/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
index 5b1f33ff1ee063afa1ed0936ec7496c1e48a05b4..604365e428eb16789756eb7da47c8558c1bce1ea 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
@@ -44,9 +44,7 @@ using MonoTests.Common;
 
 using System.Web.UI.Adapters;
 
-#if NET_4_0
 using System.Web.Routing;
-#endif
 
 namespace MonoTests.System.Web.UI
 {
@@ -973,11 +971,7 @@ namespace MonoTests.System.Web.UI
                        fr.Controls ["__EVENTTARGET"].Value = "container$children$lb";
                        fr.Controls ["__EVENTARGUMENT"].Value = String.Empty;
                        t.Request = fr;
-#if NET_4_0
                        string originalHtml = "<span id=\"container\"><a id=\"container_children_lb\" href=\"javascript:__doPostBack(&#39;container$children$lb&#39;,&#39;&#39;)\">Woot! I got clicked!</a></span><hr/>";
-#else
-                       string originalHtml = @"<span id=""container""><a href=""javascript:__doPostBack('container$children$lb','')"" id=""container_children_lb"">Woot! I got clicked!</a></span><hr/>";
-#endif
                        string pageHtml = t.Run ();
                        string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
 
@@ -998,7 +992,6 @@ namespace MonoTests.System.Web.UI
                        WebTest.CopyResource (GetType (), "OverridenControlsPropertyAndPostBack_Bug594238.aspx", "OverridenControlsPropertyAndPostBack_Bug594238.aspx");
                }
 
-#if NET_4_0
                [Test]
                public void GetRouteUrl_Object ()
                {
@@ -1116,7 +1109,6 @@ namespace MonoTests.System.Web.UI
                        path = ctl.GetRouteUrl (String.Empty, (RouteValueDictionary) null);
                        Assert.IsNull (path, "#A3-3");
                }
-#endif
                #region helpcalsses
                class ControlWithState : Control
                {

diff --git a/mcs/class/System.Web/Test/System.Web.UI/DataKeyPropertyAttributeTest.cs b/mcs/class/System.Web/Test/System.Web.UI/DataKeyPropertyAttributeTest.cs
index 6017b1261807b384245de071fc7d3700e7cda2f3..73fc20a8b602f5a177de5d7f7da904bfd9545970 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI/DataKeyPropertyAttributeTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI/DataKeyPropertyAttributeTest.cs
@@ -23,7 +23,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Web.UI;
 
@@ -60,4 +59,3 @@ namespace MonoTests.System.Web.UI
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/System.Web.UI/LosFormatterTest.cs b/mcs/class/System.Web/Test/System.Web.UI/LosFormatterTest.cs
index 03e03728e187b9bb32fdae1bd223e8a7b9a8431b..359096352cf5429e5860ca515ecbaa4252416c15 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI/LosFormatterTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI/LosFormatterTest.cs
@@ -81,13 +81,8 @@ namespace MonoTests.System.Web.UI
                        byte [] data = Convert.FromBase64String (expected);
                        byte [] signed_data = Convert.FromBase64String (signed);
                        Assert.IsTrue (BitConverter.ToString (signed_data).StartsWith (BitConverter.ToString (data)), "4 / same data");
-#if NET_4_0
                        // 32 bytes == 256 bits -> match HMACSHA256 as default
                        Assert.AreEqual (32, signed_data.Length - data.Length, "signature length");
-#else
-                       // 20 bytes == 160 bits -> match HMACSHA1 as default
-                       Assert.AreEqual (20, signed_data.Length - data.Length, "signature length");
-#endif
                }
 
                [Test]
@@ -114,13 +109,8 @@ namespace MonoTests.System.Web.UI
                        byte [] data = Convert.FromBase64String (expected);
                        byte [] signed_data = Convert.FromBase64String (signed);
                        Assert.IsTrue (BitConverter.ToString (signed_data).StartsWith (BitConverter.ToString (data)), "5 / same data");
-#if NET_4_0
                        // 32 bytes == 256 bits -> match HMACSHA256 as default
                        Assert.AreEqual (32, signed_data.Length - data.Length, "signature length");
-#else
-                       // 20 bytes == 160 bits -> match HMACSHA1 as default
-                       Assert.AreEqual (20, signed_data.Length - data.Length, "signature length");
-#endif
                        LosFormatter lf6 = new LosFormatter (true, "string"); // bug #649551
                        signed = NoKeyRoundTrip (lf6, "true, plain");
                        Assert.AreNotEqual (expected, signed, "6");
@@ -171,7 +161,6 @@ namespace MonoTests.System.Web.UI
                        Assert.AreNotEqual (r4, r5, "r4-r5");
                }
 
-#if NET_4_0
                [Test]
                [ExpectedException (typeof (NotSupportedException))]
                public void Deserialize_Stream_NonSeekable ()
@@ -181,19 +170,6 @@ namespace MonoTests.System.Web.UI
                        LosFormatter lf = new LosFormatter ();
                        lf.Serialize (ns, s1);
                }
-#else
-               [Test] // bug #411115
-               public void Deserialize_Stream_NonSeekable ()
-               {
-                       string s1 = "Hello world";
-                       NonSeekableStream ns = new NonSeekableStream ();
-                       LosFormatter lf = new LosFormatter ();
-                       lf.Serialize (ns, s1);
-                       ns.Reset ();
-                       string s2 = lf.Deserialize (ns) as string;
-                       Assert.AreEqual (s1, s2);
-               }
-#endif
                [Test] // bug #324526
                public void Serialize ()
                {

diff --git a/mcs/class/System.Web/Test/System.Web.Util/HttpEncoderTest.cs b/mcs/class/System.Web/Test/System.Web.Util/HttpEncoderTest.cs
index 4975b430ee79b4b57f406cc3d5bbe0371b376eec..4ea7ad9ab5a97920d94f96c346ac5562e71719b8 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Util/HttpEncoderTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Util/HttpEncoderTest.cs
@@ -23,7 +23,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -75,11 +74,7 @@ namespace MonoTests.System.Web.Util
        [TestFixture]
        public class HttpEncoderTest
        {
-#if NET_4_0
                const string notEncoded = "!()*-._";
-#else
-               const string notEncoded = "!'()*-._";
-#endif
                static char [] hexChars = "0123456789abcdef".ToCharArray ();
 
                [Test]
@@ -412,4 +407,3 @@ namespace MonoTests.System.Web.Util
                #endregion
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/System.Web.Util/MachineKeySectionUtilsTest.cs b/mcs/class/System.Web/Test/System.Web.Util/MachineKeySectionUtilsTest.cs
index b92554ec98aaad28d2464d75ed0e31a9b8b22ae0..8a1a4ed67374c4ea1fd20a35e7b0f0c6f525db1b 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Util/MachineKeySectionUtilsTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Util/MachineKeySectionUtilsTest.cs
@@ -107,7 +107,6 @@ namespace MonoTests.System.Web.Util {
                        section.Validation = MachineKeyValidation.SHA1;
                        Encrypt_RoundTrip (section);
                }
-#if NET_4_0
                [Test]
                public void Encrypt_RoundTrip_HMACSHA256 ()
                {
@@ -139,7 +138,6 @@ namespace MonoTests.System.Web.Util {
                        section.ValidationAlgorithm = "alg:HMACRIPEMD160";
                        EncryptSign_RoundTrip (section);
                }
-#endif
                public void EncryptSign_RoundTrip (MachineKeySection section)
                {
                        byte [] data = new byte [14];
@@ -196,7 +194,6 @@ namespace MonoTests.System.Web.Util {
                        section.Validation = MachineKeyValidation.SHA1;
                        EncryptSign_RoundTrip (section);
                }
-#if NET_4_0
                [Test]
                public void EncryptSign_RoundTrip_HMACSHA256 ()
                {
@@ -228,7 +225,6 @@ namespace MonoTests.System.Web.Util {
                        section.ValidationAlgorithm = "alg:HMACRIPEMD160";
                        EncryptSign_RoundTrip (section);
                }
-#endif
                public void Validation_RoundTrip (MachineKeySection section)
                {
                        byte [] data = new byte [] { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 };
@@ -282,7 +278,6 @@ namespace MonoTests.System.Web.Util {
                        Validation_RoundTrip (section);
                }
 
-#if NET_4_0
                [Test]
                public void Validation_RoundTrip_HMACSHA256 ()
                {
@@ -314,7 +309,6 @@ namespace MonoTests.System.Web.Util {
                        section.ValidationAlgorithm = "alg:HMACRIPEMD160";
                        Validation_RoundTrip (section);
                }
-#endif
                [Test]
                public void GetHexString ()
                {

diff --git a/mcs/class/System.Web/Test/System.Web.Util/RequestValidatorTest.cs b/mcs/class/System.Web/Test/System.Web.Util/RequestValidatorTest.cs
index cbb24fab1dc6a1e217b9381881617c3ae537f126..b185d1290fd54a9db7eff10571a38a030a6f6bdf 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Util/RequestValidatorTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Util/RequestValidatorTest.cs
@@ -24,7 +24,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -97,4 +96,3 @@ namespace MonoTests.System.Web.Util
                }
        }
 }
-#endif

diff --git a/mcs/class/System.Web/Test/System.Web/HttpApplicationTest.cs b/mcs/class/System.Web/Test/System.Web/HttpApplicationTest.cs
index 64d8773abbdd5d6f7c4073d2579f2294278222cb..7d572081fcd0fe0c3fcaa531f9e07dbe04d7c52a 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web/HttpApplicationTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpApplicationTest.cs
@@ -37,7 +37,6 @@ namespace MonoTests.System.Web
        [TestFixture]
        public class HttpApplicationTest
        {
-#if NET_4_0
                [Test]
                public void GetOutputCacheProviderName ()
                {
@@ -45,6 +44,5 @@ namespace MonoTests.System.Web
 
                        Assert.AreEqual ("AspNetInternalProvider", app.GetOutputCacheProviderName (null), "#A1");
                }
-#endif
        }
 }

diff --git a/mcs/class/System.Web/Test/System.Web/HttpCookieTest.cs b/mcs/class/System.Web/Test/System.Web/HttpCookieTest.cs
index f6eafc6d767312e356c7ef29b1e5ce24baaf4f02..387406dcbd9a03964fe7b8d1767532c97e6f98da 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web/HttpCookieTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpCookieTest.cs
@@ -357,40 +357,22 @@ namespace MonoTests.System.Web {
                        Assert.AreEqual ("`~!@#$%^", cookie.Values.Get (0), "#G5");
                        Assert.AreEqual ("*()_+-", cookie.Values.GetKey (1), "#G6");
                        Assert.AreEqual ("\\][{}|'\";:,<.>/?", cookie.Values.Get (1), "#G7");
-#if NET_4_0
                        Assert.AreEqual ("%60%7e!%40%23%24%25%5e&*()_%2b-=%5c%5d%5b%7b%7d"
                                + "%7c%27%22%3b%3a%2c%3c.%3e%2f%3f", cookie.Values.ToString (), "#G8");
-#else
-                       Assert.AreEqual ("%60%7e!%40%23%24%25%5e&*()_%2b-=%5c%5d%5b%7b%7d"
-                               + "%7c'%22%3b%3a%2c%3c.%3e%2f%3f", cookie.Values.ToString (), "#G8");
-#endif
 
                        cookie = new HttpCookie ("funkycookie11", cookie.Values.ToString ());
                        Assert.AreEqual ("System.Web.HttpCookie", cookie.ToString (), "#H1");
-#if NET_4_0
                        Assert.AreEqual ("%60%7e!%40%23%24%25%5e&*()_%2b-=%5c%5d%5b%7b%7d"
                                + "%7c%27%22%3b%3a%2c%3c.%3e%2f%3f", cookie.Value, "#H2");
-#else
-                       Assert.AreEqual ("%60%7e!%40%23%24%25%5e&*()_%2b-=%5c%5d%5b%7b%7d"
-                               + "%7c'%22%3b%3a%2c%3c.%3e%2f%3f", cookie.Value, "#H2");
-#endif
                        Assert.AreEqual (2, cookie.Values.Count, "#H3");
                        Assert.IsNull (cookie.Values.GetKey (0), "#H4");
                        Assert.AreEqual ("%60%7e!%40%23%24%25%5e", cookie.Values.Get (0), "#H5");
                        Assert.AreEqual ("*()_%2b-", cookie.Values.GetKey (1), "#H6");
-#if NET_4_0
                        Assert.AreEqual ("%5c%5d%5b%7b%7d%7c%27%22%3b%3a%2c%3c.%3e%2f%3f",
                                cookie.Values.Get (1), "#H7");
                        Assert.AreEqual ("%2560%257e!%2540%2523%2524%2525%255e&*()_%252b-="
                                + "%255c%255d%255b%257b%257d%257c%2527%2522%253b%253a%252c%253c.%2"
                                + "53e%252f%253f", cookie.Values.ToString (), "#H8");
-#else
-                       Assert.AreEqual ("%5c%5d%5b%7b%7d%7c'%22%3b%3a%2c%3c.%3e%2f%3f",
-                               cookie.Values.Get (1), "#H7");
-                       Assert.AreEqual ("%2560%257e!%2540%2523%2524%2525%255e&*()_%252b-="
-                               + "%255c%255d%255b%257b%257d%257c'%2522%253b%253a%252c%253c.%2"
-                               + "53e%252f%253f", cookie.Values.ToString (), "#H8");
-#endif
 
                        cookie = new HttpCookie ("basic");
                        cookie.Values ["one"] = "hello world";

diff --git a/mcs/class/System.Web/Test/System.Web/HttpExceptionTest.cs b/mcs/class/System.Web/Test/System.Web/HttpExceptionTest.cs
index 69a21a3bca1c6bb88cdc0b69d68f3f8980f6add5..1d33f02fa87db208ebe76b51695fbfa205a1a35c 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web/HttpExceptionTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpExceptionTest.cs
@@ -11,13 +11,11 @@ namespace MonoTests.System.Web
        [TestFixture]
        public class HttpExceptionTest
        {
-#if NET_4_0
                [Test]
                public void WebEventCode ()
                {
                        var ex = new HttpException ();
                        Assert.AreEqual (WebEventCodes.UndefinedEventCode, ex.WebEventCode);
                }
-#endif
        }
 }

diff --git a/mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs b/mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs
index 4dd13d12b4f5cec817a0b773b1664d342f465fb8..2ce8621aec4781a1245a02df3114d4f7c8d3b030 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs
@@ -33,10 +33,8 @@ using System.Configuration.Provider;
 using System.IO;
 using System.Text;
 using System.Web;
-#if NET_4_0
 using System.Web.Routing;
 using System.Web.Caching;
-#endif
 
 using NUnit.Framework;
 
@@ -634,7 +632,6 @@ namespace MonoTests.System.Web {
                        var resp = new HttpResponse (null);
                        Assert.IsNull (resp.Output, "#A1");
                }
-#if NET_4_0
                [Test]
                public void RedirectPermanent ()
                {
@@ -733,7 +730,6 @@ namespace MonoTests.System.Web {
                                context.Response.Write ((object) null);
                        }, "#A3-5");
                }
-#endif
        }
 
        [TestFixture]

diff --git a/mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs b/mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs
index 3882f2e779e958022f20ded55ba72198f56a85e7..d320a54f1f04b4837f93ebb9d2775bb5a8629653 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs
@@ -48,26 +48,16 @@ namespace MonoTests.System.Web {
                        Assert.AreEqual (String.Empty, HttpUtility.HtmlAttributeEncode (String.Empty), "#A2");
                        Assert.AreEqual ("&lt;script>", HttpUtility.HtmlAttributeEncode ("<script>"), "#A3");
                        Assert.AreEqual ("&quot;a&amp;b&quot;", HttpUtility.HtmlAttributeEncode ("\"a&b\""), "#A4");
-#if NET_4_0
                        Assert.AreEqual ("&#39;string&#39;", HttpUtility.HtmlAttributeEncode ("'string'"), "#A5");
-#else
-                       Assert.AreEqual ("'string'", HttpUtility.HtmlAttributeEncode ("'string'"), "#A5");
-#endif
                }
 
                [Test]
                public void HtmlAttributeEncode_String_TextWriter ()
                {
                        var sw = new StringWriter ();
-#if NET_4_0
                        AssertExtensions.Throws<ArgumentNullException> (() => {
                                HttpUtility.HtmlAttributeEncode ("string", null);
                        }, "#A1");
-#else
-                       AssertExtensions.Throws<NullReferenceException> (() => {
-                               HttpUtility.HtmlAttributeEncode ("string", null);
-                       }, "#A1");
-#endif
 
                        HttpUtility.HtmlAttributeEncode ("<script>", sw);
                        Assert.AreEqual ("&lt;script>", sw.ToString (), "#A2");
@@ -78,11 +68,7 @@ namespace MonoTests.System.Web {
 
                        sw = new StringWriter ();
                        HttpUtility.HtmlAttributeEncode ("'string'", sw);
-#if NET_4_0
                        Assert.AreEqual ("&#39;string&#39;", sw.ToString (), "#A4");
-#else
-                       Assert.AreEqual ("'string'", sw.ToString (), "#A4");
-#endif
                        sw = new StringWriter ();
                        HttpUtility.HtmlAttributeEncode ("\\string\\", sw);
                        Assert.AreEqual ("\\string\\", sw.ToString (), "#A5");
@@ -110,15 +96,9 @@ namespace MonoTests.System.Web {
                public void HtmlDecode_String_TextWriter ()
                {
                        StringWriter sw;
-#if NET_4_0
                        AssertExtensions.Throws<ArgumentNullException> (() => {
                                HttpUtility.HtmlDecode ("string", null);
                        }, "#A1");
-#else
-                       AssertExtensions.Throws<NullReferenceException> (() => {
-                               HttpUtility.HtmlDecode ("string", null);
-                       }, "#A1");
-#endif
 
                        sw = new StringWriter ();
                        HttpUtility.HtmlDecode (null, sw);
@@ -167,7 +147,6 @@ namespace MonoTests.System.Web {
                        windata = Encoding.Convert (Encoding.UTF8, win1251, utf8data);
                        Assert.AreEqual ("&#65308;script&#65310;", Encoding.ASCII.GetString (windata), "ok");
                }
-#if NET_4_0
                [Test]
                public void JavaScriptStringEncode ()
                {
@@ -254,20 +233,13 @@ namespace MonoTests.System.Web {
 
                        return sb.ToString ();
                }
-#endif
                [Test]
                public void HtmlEncode_2 ()
                {
                        StringWriter sw;
-#if NET_4_0
                        AssertExtensions.Throws<ArgumentNullException> (() => {
                                HttpUtility.HtmlEncode ("string", null);
                        }, "#A1");
-#else
-                       AssertExtensions.Throws<NullReferenceException> (() => {
-                               HttpUtility.HtmlEncode ("string", null);
-                       }, "#A1");
-#endif
 
                        sw = new StringWriter ();
                        HttpUtility.HtmlEncode (null, sw);
@@ -293,7 +265,6 @@ namespace MonoTests.System.Web {
                        for (int i = 0; i < encoding_pairs.Length; i += 2)
                                Assert.AreEqual (encoding_pairs [i + 1], HttpUtility.HtmlEncode (encoding_pairs [i]), "#B" + (i / 2).ToString ());
                }
-#if NET_4_0
                [Test]
                public void HtmlEncode_IHtmlString ()
                {
@@ -301,7 +272,6 @@ namespace MonoTests.System.Web {
                        var hs = new HtmlString (origString);
                        Assert.AreEqual (origString, HttpUtility.HtmlEncode (hs), "#A1");
                }
-#endif
                [Test]
                [Category ("NotWorking")]
                public void HtmlEncode ()
@@ -322,9 +292,7 @@ namespace MonoTests.System.Web {
                        for (int i = 0; i < s.Length; i++) {
                                char c = s [i];
                                if (c == '&' || c == '"' || c == '<' || c == '>' || c > 159
-#if NET_4_0
  || c == '\''
-#endif
 ) {
                                        needEncode = true;
                                        break;
@@ -351,11 +319,9 @@ namespace MonoTests.System.Web {
                                        case '"':
                                                output.Append ("&quot;");
                                                break;
-#if NET_4_0
                                        case '\'':
                                                output.Append ("&#39;");
                                                break;
-#endif
                                        default:
                                                // MS starts encoding with &# from 160 and stops at 255.
                                                // We don't do that. One reason is the 65308/65310 unicode
@@ -539,9 +505,7 @@ namespace MonoTests.System.Web {
                                string str = new string ((char) i, 1);
                                string encoded = HttpUtility.HtmlEncode (str);
                                if ((i > 159 && i < 256) || i == '&' || i == '<' || i == '>' || i == '"'
-#if NET_4_0
  || i == '\''
-#endif
 ) {
                                        if (encoded [0] != '&' || encoded [encoded.Length - 1] != ';')
                                                Assert.Fail ("Failed for i = " + i);
@@ -623,11 +587,7 @@ namespace MonoTests.System.Web {
 
                static char [] hexChars = "0123456789abcdef".ToCharArray ();
 
-#if NET_4_0
                const string notEncoded = "!()*-._";
-#else
-               const string notEncoded = "!'()*-._";
-#endif
 
                static void UrlPathEncodeChar (char c, Stream result)
                {
@@ -822,17 +782,9 @@ namespace MonoTests.System.Web {
        @"&#160;&#161;&#162;&#163;&#164;&#165;&#166;&#167;&#168;&#169;&#170;&#171;&#172;&#173;&#174;&#175;&#176;&#177;&#178;&#179;&#180;&#181;&#182;&#183;&#184;&#185;&#186;&#187;&#188;&#189;&#190;&#191;&#192;&#193;&#194;&#195;&#196;&#197;&#198;&#199;&#200;&#201;&#202;&#203;&#204;&#205;&#206;&#207;&#208;&#209;&#210;&#211;&#212;&#213;&#214;&#215;&#216;&#217;&#218;&#219;&#220;&#221;&#222;&#223;&#224;&#225;&#226;&#227;&#228;&#229;&#230;&#231;&#232;&#233;&#234;&#235;&#236;&#237;&#238;&#239;&#240;&#241;&#242;&#243;&#244;&#245;&#246;&#247;&#248;&#249;&#250;&#251;&#252;&#253;&#254;&#255;",
        @" ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ",
        @"&#000;&#001;&#002;&#003;&#004;&#005;&#006;&#007;&#008;&#009;&#010;&#011;&#012;&#013;&#014;&#015;&#016;&#017;&#018;&#019;&#020;&#021;&#022;&#023;&#024;&#025;&#026;&#027;&#028;&#029;&#030;&#031;&#032;",
-#if NET_4_0
        "&#000;\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f ",
-#else
-       "\x0\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f ",
-#endif
        @"&#x00;&#x01;&#x02;&#x03;&#x04;&#x05;&#x06;&#x07;&#x08;&#x09;&#x0A;&#x0B;&#x0C;&#x0D;&#x0E;&#x0F;&#x10;&#x11;&#x12;&#x13;&#x14;&#x15;&#x16;&#x17;&#x18;&#x19;&#x1A;&#x1B;&#x1C;&#x1D;&#x1E;&#x1F;&#x20;",
-#if NET_4_0    
        "&#x00;\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f ",
-#else
-       "\x0\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f ",
-#endif
 @"&#xA0;&#xA1;&#xA2;&#xA3;&#xA4;&#xA5;&#xA6;&#xA7;&#xA8;&#xA9;&#xAA;&#xAB;&#xAC;&#xAD;&#xAE;&#xAF;&#xB0;&#xB1;&#xB2;&#xB3;&#xB4;&#xB5;&#xB6;&#xB7;&#xB8;&#xB9;&#xBA;&#xBB;&#xBC;&#xBD;&#xBE;&#xBF;&#xC0;&#xC1;&#xC2;&#xC3;&#xC4;&#xC5;&#xC6;&#xC7;&#xC8;&#xC9;&#xCA;&#xCB;&#xCC;&#xCD;&#xCE;&#xCF;&#xD0;&#xD1;&#xD2;&#xD3;&#xD4;&#xD5;&#xD6;&#xD7;&#xD8;&#xD9;&#xDA;&#xDB;&#xDC;&#xDD;&#xDE;&#xDF;&#xE0;&#xE1;&#xE2;&#xE3;&#xE4;&#xE5;&#xE6;&#xE7;&#xE8;&#xE9;&#xEA;&#xEB;&#xEC;&#xED;&#xEE;&#xEF;&#xF0;&#xF1;&#xF2;&#xF3;&#xF4;&#xF5;&#xF6;&#xF7;&#xF8;&#xF9;&#xFA;&#xFB;&#xFC;&#xFD;&#xFE;&#xFF;",
        " ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ",
 };
@@ -840,11 +792,7 @@ namespace MonoTests.System.Web {
        @"áÁâ´æÆàÀℵαΑ&∧∠åÅ≈ãÃäÄ„βΒ¦•∩çǸ¢χΧˆ♣≅©↵∪¤†‡↓⇓°δΔ♦÷éÉêÊèÈ∅  εΕ≡ηΗðÐëË€∃ƒ∀½¼¾⁄γΓ≥>↔⇔♥…íÍîΡìÌℑ∞∫ιΙ¿∈ïÏκΚλΛ〈«←⇐⌈“≤⌊∗◊‎‹‘<¯—µ·−μΜ∇ –≠∋¬∉⊄ñÑνΝóÓôÔœŒòÒ‾ωΩοΟ⊕∨ªºøØõÕ⊗öÖ¶∂‰⊥φΦπΠϖ±£′″∏∝ψΨ""√〉»→⇒⌉”ℜ®⌋ρΡ‏›’‚šŠ⋅§­σΣς∼♠⊂⊆∑⊃¹²³⊇ßτΤ∴θΘϑ þޘיúÚ↑⇑ûÛùÙ¨ϒυΥüÜ℘ξΞýÝ¥ÿŸζΖ‍‌",
        @"&#225;&#193;&#226;&#194;&#180;&#230;&#198;&#224;&#192;ℵαΑ&amp;∧∠&#229;&#197;≈&#227;&#195;&#228;&#196;„βΒ&#166;•∩&#231;&#199;&#184;&#162;χΧˆ♣≅&#169;↵∪&#164;†‡↓⇓&#176;δΔ♦&#247;&#233;&#201;&#234;&#202;&#232;&#200;∅  εΕ≡ηΗ&#240;&#208;&#235;&#203;€∃ƒ∀&#189;&#188;&#190;⁄γΓ≥&gt;↔⇔♥…&#237;&#205;&#238;&#206;&#161;&#236;&#204;ℑ∞∫ιΙ&#191;∈&#239;&#207;κΚλΛ〈&#171;←⇐⌈“≤⌊∗◊‎‹‘&lt;&#175;—&#181;&#183;−μΜ∇&#160;–≠∋&#172;∉⊄&#241;&#209;νΝ&#243;&#211;&#244;&#212;œŒ&#242;&#210;‾ωΩοΟ⊕∨&#170;&#186;&#248;&#216;&#245;&#213;⊗&#246;&#214;&#182;∂‰⊥φΦπΠϖ&#177;&#163;′″∏∝ψΨ&quot;√〉&#187;→⇒⌉”ℜ&#174;⌋ρΡ‏›’‚šŠ⋅&#167;&#173;σΣς∼♠⊂⊆∑⊃&#185;&#178;&#179;⊇&#223;τΤ∴θΘϑ &#254;&#222;˜&#215;™&#250;&#218;↑⇑&#251;&#219;&#249;&#217;&#168;ϒυΥ&#252;&#220;℘ξΞ&#253;&#221;&#165;&#255;ŸζΖ‍‌",
        @"á9cP!qdO#hU@mg1ÁK%0<}*âÂ5[Y;lfMQ$4`´uim7E`%_1zVDkæ[cM{Æt9y:E8Hb;;$;Y'àUa6wÀ<$@W9$4NL*h#'ℵk\zαG}{}hC-Α|=QhyLT%`&wB!@#x51R 4C∧]Z3n∠y>:{JZ'v|c0;N""åzcWM'z""gÅo-JX!r.e≈Z+BT{wF8+ãQ 6P1o?x""ef}vUÃ+</Nt)TI]sä0Eg_'mn&6WY[8Äay+ u[3kqoZ„i6rβUX\:_y1A^x.p>+Β`uf3/HI¦7bCRv%o$X3:•∩ç|(fgiA|MBLf=y@Ǹ¢R,qDW;F9<mχU]$)Q`w^KF^(hΧ?ukX+O!UOftˆZE♣@MLR(vcH]k8≅CU;r#(©7DZ`1>r~.↵4B&R∪+x2T`q[M-lq'¤~3rp%~-Gd†;35wU+II1tQJ‡`NGh[↓Lr>74~yHB=&EI⇓,u@Jx°δcC`2,Δo2B]6PP8♦|{!wZa&,*N'$6÷-{nVSgO]%(Ié6Éêosx-2xDI!Ê_]7Ub%èYG4`Gx{ÈH>vwMPJ∅ :Z-u#ph l,s*8(AεΕOnj|Gy|]iYLPR≡5Wi:(vZUUK.YlηDΗ6TðT!Z:Nq_0797;!Ð4]QNë9+>x9>nm-s8YËwZ}vY€:HHf∃;=0,?ƒIr`I:i5'∀z_$Q<½_sCF;=$43DpDz]¼.aMTIEwx\ogn7A¾CuJD[Hke#⁄E]M%γE:IEk}Γ{qXfzeUS≥kqW yxV>↔AzJ:$fJ⇔3IMDqU\myWjsL♥…Okíjt$NKbGrÍ""+alp<îRÎ%¡yìz2 AÌ-%;jyMK{Umdℑi|}+Za8jyWDS#I∞]NyqN*v:m-∫03Aιf9m.:+z0@OfVoΙ_gfPilLZ¿6qqb0|BQ$H%p+d∈.Wa=YBfS'd-EOïISG+=W;GHÏ3||b-icT""qAκ*/ΚλN>j}""WrqΛt]dm-Xe/v〈\«$F< X←]=8H8⇐c⌈|“JgZ)+(7,}≤s8[""3%C4JvN⌊H55TAKEZ*%Z)d.∗R9z//!q◊D`643eO‎&-L>DsUej‹C[n]Q<%UoyO‘?zUgpr+62sY<T{7n*^¯4CH]6^e/x/—uT->mQh\""µZSTN!F(U%5·17:Cu<−)*c2μTΜ%:6-e&L[ Xos/4∇]Xr 1c=qyv4HSw~HL~–{+qG?/}≠6`S"",+pL∋>¬B9∉G;6P]xc 0Bs⊄7,j0Sj2/&ñFsÑ=νKs*?[54bV1ΝQ%p6P0.Lrc`yóA/*`6sBH?67Ó&ôÔI""Hœ~e9Œ>oò5eZI}iy?}KÒS‾anD1nXωIΩu""ο:Mz$(""joU^[mΟ7M1f$j>N|Q/@(⊕de6(∨WXb<~;tI?bt#ªU:º+wb(*cA=øjb c%*?Uj6<T02Ø/A}j'MõjlfYlR~er7D@3WÕe:XTLF?|""yd7x⊗eV6Mmw2{K<lö%B%/o~r9Öc1Q TJnd^¶;∂|‰_.⊥E_bim;gvA{wqφeΦ^-!Dcπ8LB6k4PΠ(5D |Y3ϖptuh)3Mv±TAvFo+;JE,2?£""'6F9fRp′,0″<∏N∝C%}JC7qY(7))UWψ 7=rmQaΨeD!G5e>S~kO""'4""/i4\>!]H;T^0o√8_G`*8&An\rhc)〉&UEk»-(YtC→(zerUTMTe,'@{⇒mlzVhU<S,5}9DM⌉/%R=10*[{'=:”C0ℜ4HoT?-#+l[SnPs®0 bV⌋TρΡjb1}OJ:,0z6‏oTxP""""FOT[;›'’-:Ll)I0^$p.‚S_šNBr9)K[Š1⋅$-S4/G&u§= _CqlY1O'­qNf|&σGp}ΣP3:8ς∼[ItI♠8⊂BQn~!KO:+~ma⊆FV.u 4wD∑lE+kQ|gZ];Y⊃DK69EEM$D¹KVO²%:~Iq?IUcHr4y³QP@R't!⊇vßYnI@FXxT<τvL[4H95mfΤF0JzQsrxNZry∴Bn#t(θ*OΘw=Z%ϑ+*l^3C)5HCNmR  %`g|*8DECþ_[Þ'8,?˜}gnaz_U×-F^™9ZDO86ú]y\ecHQSÚk-07/AT|0Ce↑F⇑*}e|r$6ln!V`ûA!*8H,mÛ~6G6w&GùsPL6ÙQ¨}J^NO}=._Mnϒ{&υ=ΥWD+f>fy|nNyP*Jüo8,lh\ÜN`'g℘(sJ8h3P]cF ξcdQ_OC]U#ΞBby=Sý9tI_Ý}p(D51=X¥cH8L)$*]~=IÿdbŸf>J^1Dnζ@(drH;91?{6`xJΖ4N4[u+5‍9.W\v‌]GGtKvCC0`A",
-#if NET_4_0    
        @"&#225;9cP!qdO#hU@mg1&#193;K%0&lt;}*&#226;&#194;5[Y;lfMQ$4`&#180;uim7E`%_1zVDk&#230;[cM{&#198;t9y:E8Hb;;$;Y&#39;&#224;Ua6w&#192;&lt;$@W9$4NL*h#&#39;ℵk\zαG}{}hC-Α|=QhyLT%`&amp;wB!@#x51R 4C∧]Z3n∠y&gt;:{JZ&#39;v|c0;N&quot;&#229;zcWM&#39;z&quot;g&#197;o-JX!r.e≈Z+BT{wF8+&#227;Q 6P1o?x&quot;ef}vU&#195;+&lt;/Nt)TI]s&#228;0Eg_&#39;mn&amp;6WY[8&#196;ay+ u[3kqoZ„i6rβUX\:_y1A^x.p&gt;+Β`uf3/HI&#166;7bCRv%o$X3:•∩&#231;|(fgiA|MBLf=y@&#199;&#184;&#162;R,qDW;F9&lt;mχU]$)Q`w^KF^(hΧ?ukX+O!UOftˆZE♣@MLR(vcH]k8≅CU;r#(&#169;7DZ`1&gt;r~.↵4B&amp;R∪+x2T`q[M-lq&#39;&#164;~3rp%~-Gd†;35wU+II1tQJ‡`NGh[↓Lr&gt;74~yHB=&amp;EI⇓,u@Jx&#176;δcC`2,Δo2B]6PP8♦|{!wZa&amp;,*N&#39;$6&#247;-{nVSgO]%(I&#233;6&#201;&#234;osx-2xDI!&#202;_]7Ub%&#232;YG4`Gx{&#200;H&gt;vwMPJ∅ :Z-u#ph l,s*8(AεΕOnj|Gy|]iYLPR≡5Wi:(vZUUK.YlηDΗ6T&#240;T!Z:Nq_0797;!&#208;4]QN&#235;9+&gt;x9&gt;nm-s8Y&#203;wZ}vY€:HHf∃;=0,?ƒIr`I:i5&#39;∀z_$Q&lt;&#189;_sCF;=$43DpDz]&#188;.aMTIEwx\ogn7A&#190;CuJD[Hke#⁄E]M%γE:IEk}Γ{qXfzeUS≥kqW yxV&gt;↔AzJ:$fJ⇔3IMDqU\myWjsL♥…Ok&#237;jt$NKbGr&#205;&quot;+alp&lt;&#238;R&#206;%&#161;y&#236;z2 A&#204;-%;jyMK{Umdℑi|}+Za8jyWDS#I∞]NyqN*v:m-∫03Aιf9m.:+z0@OfVoΙ_gfPilLZ&#191;6qqb0|BQ$H%p+d∈.Wa=YBfS&#39;d-EO&#239;ISG+=W;GH&#207;3||b-icT&quot;qAκ*/ΚλN&gt;j}&quot;WrqΛt]dm-Xe/v〈\&#171;$F&lt; X←]=8H8⇐c⌈|“JgZ)+(7,}≤s8[&quot;3%C4JvN⌊H55TAKEZ*%Z)d.∗R9z//!q◊D`643eO‎&amp;-L&gt;DsUej‹C[n]Q&lt;%UoyO‘?zUgpr+62sY&lt;T{7n*^&#175;4CH]6^e/x/—uT-&gt;mQh\&quot;&#181;ZSTN!F(U%5&#183;17:Cu&lt;−)*c2μTΜ%:6-e&amp;L[ Xos/4∇]Xr&#160;1c=qyv4HSw~HL~–{+qG?/}≠6`S&quot;,+pL∋&gt;&#172;B9∉G;6P]xc 0Bs⊄7,j0Sj2/&amp;&#241;Fs&#209;=νKs*?[54bV1ΝQ%p6P0.Lrc`y&#243;A/*`6sBH?67&#211;&amp;&#244;&#212;I&quot;Hœ~e9Œ&gt;o&#242;5eZI}iy?}K&#210;S‾anD1nXωIΩu&quot;ο:Mz$(&quot;joU^[mΟ7M1f$j&gt;N|Q/@(⊕de6(∨WXb&lt;~;tI?bt#&#170;U:&#186;+wb(*cA=&#248;jb c%*?Uj6&lt;T02&#216;/A}j&#39;M&#245;jlfYlR~er7D@3W&#213;e:XTLF?|&quot;yd7x⊗eV6Mmw2{K&lt;l&#246;%B%/o~r9&#214;c1Q TJnd^&#182;;∂|‰_.⊥E_bim;gvA{wqφeΦ^-!Dcπ8LB6k4PΠ(5D |Y3ϖptuh)3Mv&#177;TAvFo+;JE,2?&#163;&quot;&#39;6F9fRp′,0″&lt;∏N∝C%}JC7qY(7))UWψ 7=rmQaΨeD!G5e&gt;S~kO&quot;&#39;4&quot;/i4\&gt;!]H;T^0o√8_G`*8&amp;An\rhc)〉&amp;UEk&#187;-(YtC→(zerUTMTe,&#39;@{⇒mlzVhU&lt;S,5}9DM⌉/%R=10*[{&#39;=:”C0ℜ4HoT?-#+l[SnPs&#174;0 bV⌋TρΡjb1}OJ:,0z6‏oTxP&quot;&quot;FOT[;›&#39;’-:Ll)I0^$p.‚S_šNBr9)K[Š1⋅$-S4/G&amp;u&#167;= _CqlY1O&#39;&#173;qNf|&amp;σGp}ΣP3:8ς∼[ItI♠8⊂BQn~!KO:+~ma⊆FV.u 4wD∑lE+kQ|gZ];Y⊃DK69EEM$D&#185;KVO&#178;%:~Iq?IUcHr4y&#179;QP@R&#39;t!⊇v&#223;YnI@FXxT&lt;τvL[4H95mfΤF0JzQsrxNZry∴Bn#t(θ*OΘw=Z%ϑ+*l^3C)5HCNmR  %`g|*8DEC&#254;_[&#222;&#39;8,?˜}gnaz_U&#215;-F^™9ZDO86&#250;]y\ecHQS&#218;k-07/AT|0Ce↑F⇑*}e|r$6ln!V`&#251;A!*8H,m&#219;~6G6w&amp;G&#249;sPL6&#217;Q&#168;}J^NO}=._Mnϒ{&amp;υ=ΥWD+f&gt;fy|nNyP*J&#252;o8,lh\&#220;N`&#39;g℘(sJ8h3P]cF ξcdQ_OC]U#ΞBby=S&#253;9tI_&#221;}p(D51=X&#165;cH8L)$*]~=I&#255;dbŸf&gt;J^1Dnζ@(drH;91?{6`xJΖ4N4[u+5‍9.W\v‌]GGtKvCC0`A",
-#else
-       @"&#225;9cP!qdO#hU@mg1&#193;K%0&lt;}*&#226;&#194;5[Y;lfMQ$4`&#180;uim7E`%_1zVDk&#230;[cM{&#198;t9y:E8Hb;;$;Y'&#224;Ua6w&#192;&lt;$@W9$4NL*h#'ℵk\zαG}{}hC-Α|=QhyLT%`&amp;wB!@#x51R 4C∧]Z3n∠y&gt;:{JZ'v|c0;N&quot;&#229;zcWM'z&quot;g&#197;o-JX!r.e≈Z+BT{wF8+&#227;Q 6P1o?x&quot;ef}vU&#195;+&lt;/Nt)TI]s&#228;0Eg_'mn&amp;6WY[8&#196;ay+ u[3kqoZ„i6rβUX\:_y1A^x.p&gt;+Β`uf3/HI&#166;7bCRv%o$X3:•∩&#231;|(fgiA|MBLf=y@&#199;&#184;&#162;R,qDW;F9&lt;mχU]$)Q`w^KF^(hΧ?ukX+O!UOftˆZE♣@MLR(vcH]k8≅CU;r#(&#169;7DZ`1&gt;r~.↵4B&amp;R∪+x2T`q[M-lq'&#164;~3rp%~-Gd†;35wU+II1tQJ‡`NGh[↓Lr&gt;74~yHB=&amp;EI⇓,u@Jx&#176;δcC`2,Δo2B]6PP8♦|{!wZa&amp;,*N'$6&#247;-{nVSgO]%(I&#233;6&#201;&#234;osx-2xDI!&#202;_]7Ub%&#232;YG4`Gx{&#200;H&gt;vwMPJ∅ :Z-u#ph l,s*8(AεΕOnj|Gy|]iYLPR≡5Wi:(vZUUK.YlηDΗ6T&#240;T!Z:Nq_0797;!&#208;4]QN&#235;9+&gt;x9&gt;nm-s8Y&#203;wZ}vY€:HHf∃;=0,?ƒIr`I:i5'∀z_$Q&lt;&#189;_sCF;=$43DpDz]&#188;.aMTIEwx\ogn7A&#190;CuJD[Hke#⁄E]M%γE:IEk}Γ{qXfzeUS≥kqW yxV&gt;↔AzJ:$fJ⇔3IMDqU\myWjsL♥…Ok&#237;jt$NKbGr&#205;&quot;+alp&lt;&#238;R&#206;%&#161;y&#236;z2 A&#204;-%;jyMK{Umdℑi|}+Za8jyWDS#I∞]NyqN*v:m-∫03Aιf9m.:+z0@OfVoΙ_gfPilLZ&#191;6qqb0|BQ$H%p+d∈.Wa=YBfS'd-EO&#239;ISG+=W;GH&#207;3||b-icT&quot;qAκ*/ΚλN&gt;j}&quot;WrqΛt]dm-Xe/v〈\&#171;$F&lt; X←]=8H8⇐c⌈|“JgZ)+(7,}≤s8[&quot;3%C4JvN⌊H55TAKEZ*%Z)d.∗R9z//!q◊D`643eO‎&amp;-L&gt;DsUej‹C[n]Q&lt;%UoyO‘?zUgpr+62sY&lt;T{7n*^&#175;4CH]6^e/x/—uT-&gt;mQh\&quot;&#181;ZSTN!F(U%5&#183;17:Cu&lt;−)*c2μTΜ%:6-e&amp;L[ Xos/4∇]Xr&#160;1c=qyv4HSw~HL~–{+qG?/}≠6`S&quot;,+pL∋&gt;&#172;B9∉G;6P]xc 0Bs⊄7,j0Sj2/&amp;&#241;Fs&#209;=νKs*?[54bV1ΝQ%p6P0.Lrc`y&#243;A/*`6sBH?67&#211;&amp;&#244;&#212;I&quot;Hœ~e9Œ&gt;o&#242;5eZI}iy?}K&#210;S‾anD1nXωIΩu&quot;ο:Mz$(&quot;joU^[mΟ7M1f$j&gt;N|Q/@(⊕de6(∨WXb&lt;~;tI?bt#&#170;U:&#186;+wb(*cA=&#248;jb c%*?Uj6&lt;T02&#216;/A}j'M&#245;jlfYlR~er7D@3W&#213;e:XTLF?|&quot;yd7x⊗eV6Mmw2{K&lt;l&#246;%B%/o~r9&#214;c1Q TJnd^&#182;;∂|‰_.⊥E_bim;gvA{wqφeΦ^-!Dcπ8LB6k4PΠ(5D |Y3ϖptuh)3Mv&#177;TAvFo+;JE,2?&#163;&quot;'6F9fRp′,0″&lt;∏N∝C%}JC7qY(7))UWψ 7=rmQaΨeD!G5e&gt;S~kO&quot;'4&quot;/i4\&gt;!]H;T^0o√8_G`*8&amp;An\rhc)〉&amp;UEk&#187;-(YtC→(zerUTMTe,'@{⇒mlzVhU&lt;S,5}9DM⌉/%R=10*[{'=:”C0ℜ4HoT?-#+l[SnPs&#174;0 bV⌋TρΡjb1}OJ:,0z6‏oTxP&quot;&quot;FOT[;›'’-:Ll)I0^$p.‚S_šNBr9)K[Š1⋅$-S4/G&amp;u&#167;= _CqlY1O'&#173;qNf|&amp;σGp}ΣP3:8ς∼[ItI♠8⊂BQn~!KO:+~ma⊆FV.u 4wD∑lE+kQ|gZ];Y⊃DK69EEM$D&#185;KVO&#178;%:~Iq?IUcHr4y&#179;QP@R't!⊇v&#223;YnI@FXxT&lt;τvL[4H95mfΤF0JzQsrxNZry∴Bn#t(θ*OΘw=Z%ϑ+*l^3C)5HCNmR  %`g|*8DEC&#254;_[&#222;'8,?˜}gnaz_U&#215;-F^™9ZDO86&#250;]y\ecHQS&#218;k-07/AT|0Ce↑F⇑*}e|r$6ln!V`&#251;A!*8H,m&#219;~6G6w&amp;G&#249;sPL6&#217;Q&#168;}J^NO}=._Mnϒ{&amp;υ=ΥWD+f&gt;fy|nNyP*J&#252;o8,lh\&#220;N`'g℘(sJ8h3P]cF ξcdQ_OC]U#ΞBby=S&#253;9tI_&#221;}p(D51=X&#165;cH8L)$*]~=I&#255;dbŸf&gt;J^1Dnζ@(drH;91?{6`xJΖ4N4[u+5‍9.W\v‌]GGtKvCC0`A",
-#endif
        @"&aacute&Aacute&acirc&Acirc&acute&aelig&AElig&agrave&Agrave&alefsym&alpha&Alpha&amp&and&ang&aring&Aring&asymp&atilde&Atilde&auml&Auml&bdquo&beta&Beta&brvbar&bull&cap&ccedil&Ccedil&cedil&cent&chi&Chi&circ&clubs&cong&copy&crarr&cup&curren&dagger&Dagger&darr&dArr&deg&delta&Delta&diams&divide&eacute&Eacute&ecirc&Ecirc&egrave&Egrave&empty&emsp&ensp&epsilon&Epsilon&equiv&eta&Eta&eth&ETH&euml&Euml&euro&exist&fnof&forall&frac12&frac14&frac34&frasl&gamma&Gamma&ge&gt&harr&hArr&hearts&hellip&iacute&Iacute&icirc&Icirc&iexcl&igrave&Igrave&image&infin&int&iota&Iota&iquest&isin&iuml&Iuml&kappa&Kappa&lambda&Lambda&lang&laquo&larr&lArr&lceil&ldquo&le&lfloor&lowast&loz&lrm&lsaquo&lsquo&lt&macr&mdash&micro&middot&minus&mu&Mu&nabla&nbsp&ndash&ne&ni&not&notin&nsub&ntilde&Ntilde&nu&Nu&oacute&Oacute&ocirc&Ocirc&oelig&OElig&ograve&Ograve&oline&omega&Omega&omicron&Omicron&oplus&or&ordf&ordm&oslash&Oslash&otilde&Otilde&otimes&ouml&Ouml&para&part&permil&perp&phi&Phi&pi&Pi&piv&plusmn&pound&prime&Prime&prod&prop&psi&Psi&quot&radic&rang&raquo&rarr&rArr&rceil&rdquo&real&reg&rfloor&rho&Rho&rlm&rsaquo&rsquo&sbquo&scaron&Scaron&sdot&sect&shy&sigma&Sigma&sigmaf&sim&spades&sub&sube&sum&sup&sup1&sup2&sup3&supe&szlig&tau&Tau&there4&theta&Theta&thetasym&thinsp&thorn&THORN&tilde&times&trade&uacute&Uacute&uarr&uArr&ucirc&Ucirc&ugrave&Ugrave&uml&upsih&upsilon&Upsilon&uuml&Uuml&weierp&xi&Xi&yacute&Yacute&yen&yuml&Yuml&zeta&Zeta&zwj&zwnj",
        @"&amp;aacute&amp;Aacute&amp;acirc&amp;Acirc&amp;acute&amp;aelig&amp;AElig&amp;agrave&amp;Agrave&amp;alefsym&amp;alpha&amp;Alpha&amp;amp&amp;and&amp;ang&amp;aring&amp;Aring&amp;asymp&amp;atilde&amp;Atilde&amp;auml&amp;Auml&amp;bdquo&amp;beta&amp;Beta&amp;brvbar&amp;bull&amp;cap&amp;ccedil&amp;Ccedil&amp;cedil&amp;cent&amp;chi&amp;Chi&amp;circ&amp;clubs&amp;cong&amp;copy&amp;crarr&amp;cup&amp;curren&amp;dagger&amp;Dagger&amp;darr&amp;dArr&amp;deg&amp;delta&amp;Delta&amp;diams&amp;divide&amp;eacute&amp;Eacute&amp;ecirc&amp;Ecirc&amp;egrave&amp;Egrave&amp;empty&amp;emsp&amp;ensp&amp;epsilon&amp;Epsilon&amp;equiv&amp;eta&amp;Eta&amp;eth&amp;ETH&amp;euml&amp;Euml&amp;euro&amp;exist&amp;fnof&amp;forall&amp;frac12&amp;frac14&amp;frac34&amp;frasl&amp;gamma&amp;Gamma&amp;ge&amp;gt&amp;harr&amp;hArr&amp;hearts&amp;hellip&amp;iacute&amp;Iacute&amp;icirc&amp;Icirc&amp;iexcl&amp;igrave&amp;Igrave&amp;image&amp;infin&amp;int&amp;iota&amp;Iota&amp;iquest&amp;isin&amp;iuml&amp;Iuml&amp;kappa&amp;Kappa&amp;lambda&amp;Lambda&amp;lang&amp;laquo&amp;larr&amp;lArr&amp;lceil&amp;ldquo&amp;le&amp;lfloor&amp;lowast&amp;loz&amp;lrm&amp;lsaquo&amp;lsquo&amp;lt&amp;macr&amp;mdash&amp;micro&amp;middot&amp;minus&amp;mu&amp;Mu&amp;nabla&amp;nbsp&amp;ndash&amp;ne&amp;ni&amp;not&amp;notin&amp;nsub&amp;ntilde&amp;Ntilde&amp;nu&amp;Nu&amp;oacute&amp;Oacute&amp;ocirc&amp;Ocirc&amp;oelig&amp;OElig&amp;ograve&amp;Ograve&amp;oline&amp;omega&amp;Omega&amp;omicron&amp;Omicron&amp;oplus&amp;or&amp;ordf&amp;ordm&amp;oslash&amp;Oslash&amp;otilde&amp;Otilde&amp;otimes&amp;ouml&amp;Ouml&amp;para&amp;part&amp;permil&amp;perp&amp;phi&amp;Phi&amp;pi&amp;Pi&amp;piv&amp;plusmn&amp;pound&amp;prime&amp;Prime&amp;prod&amp;prop&amp;psi&amp;Psi&amp;quot&amp;radic&amp;rang&amp;raquo&amp;rarr&amp;rArr&amp;rceil&amp;rdquo&amp;real&amp;reg&amp;rfloor&amp;rho&amp;Rho&amp;rlm&amp;rsaquo&amp;rsquo&amp;sbquo&amp;scaron&amp;Scaron&amp;sdot&amp;sect&amp;shy&amp;sigma&amp;Sigma&amp;sigmaf&amp;sim&amp;spades&amp;sub&amp;sube&amp;sum&amp;sup&amp;sup1&amp;sup2&amp;sup3&amp;supe&amp;szlig&amp;tau&amp;Tau&amp;there4&amp;theta&amp;Theta&amp;thetasym&amp;thinsp&amp;thorn&amp;THORN&amp;tilde&amp;times&amp;trade&amp;uacute&amp;Uacute&amp;uarr&amp;uArr&amp;ucirc&amp;Ucirc&amp;ugrave&amp;Ugrave&amp;uml&amp;upsih&amp;upsilon&amp;Upsilon&amp;uuml&amp;Uuml&amp;weierp&amp;xi&amp;Xi&amp;yacute&amp;Yacute&amp;yen&amp;yuml&amp;Yuml&amp;zeta&amp;Zeta&amp;zwj&amp;zwnj",
        @" ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ",

diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTestLocal.cs b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTestLocal.cs
index 9f2dcaf4b224a065297d177a98504ed5e786b41b..7fdb6ed6c157e655f39a9f659568b69758f7d98c 100644 (file)
--- a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTestLocal.cs
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTestLocal.cs
@@ -12,11 +12,7 @@ namespace MonoTests.SystemWeb.Framework
 #if DOTNET
                        CopyResource (myself, "Web.config", "Web.config");
 #else
-#if NET_4_0
                        CopyResource (myself, "Web.mono.config.4.0", "Web.config");
-#else
-                       CopyResource (myself, "Web.mono.config", "Web.config");
-#endif
 #endif
                }
        }

diff --git a/mcs/class/System.Web/Test/standalone-tests/ApplicationPreStartMethods.cs b/mcs/class/System.Web/Test/standalone-tests/ApplicationPreStartMethods.cs
index 57b92434e3b6d743084212ed5f4d5529a449b730..80da7625724e2f304a44575e826e3e294d656be7 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/ApplicationPreStartMethods.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/ApplicationPreStartMethods.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -292,4 +291,3 @@ ExternalAssembly1 added
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/standalone-tests/BuildManagerCacheFiles.cs b/mcs/class/System.Web/Test/standalone-tests/BuildManagerCacheFiles.cs
index 104908218d0466c5cb8e8f05693907e00c445167..e51c9c603b420aaa278351e92794e5485811381f 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/BuildManagerCacheFiles.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/BuildManagerCacheFiles.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -157,4 +156,3 @@ namespace StandAloneTests.BuildManagerCacheFiles
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/standalone-tests/ControlRenderingCompatibilityVersion.cs b/mcs/class/System.Web/Test/standalone-tests/ControlRenderingCompatibilityVersion.cs
index 6bdfe01aef5ca8134acd3d8e6e87b2d3ffc22fe1..9093ef97d78bdbece658ed61eee559c4532699c6 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/ControlRenderingCompatibilityVersion.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/ControlRenderingCompatibilityVersion.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -75,4 +74,3 @@ namespace StandAloneTests.ControlRenderingCompatibilityVersion
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/standalone-tests/Control_GetUniqueIDRelativeTo.cs b/mcs/class/System.Web/Test/standalone-tests/Control_GetUniqueIDRelativeTo.cs
index 5de2f85fc5c7c8bf20b73b475282cb947be43a67..26e39395d6250edf46272b6e2dce0ae94ca3f14b 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/Control_GetUniqueIDRelativeTo.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/Control_GetUniqueIDRelativeTo.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -113,4 +112,3 @@ Item: 2; Relative to: __Page; Result: exception System.InvalidOperationException
        }
 }
 
-#endif

diff --git a/mcs/class/System.Web/Test/standalone-tests/DisabledAttributeRendering.cs b/mcs/class/System.Web/Test/standalone-tests/DisabledAttributeRendering.cs
index 3d7b9e3143ceb3ba53c2b853f3215b647a662413..2f68077216881a6c6e4b28fa088f92666dbf428a 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/DisabledAttributeRendering.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/DisabledAttributeRendering.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -100,4 +99,3 @@ namespace StandAloneTests.DisabledAttributeRendering
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/standalone-tests/EnableFormsAuthentication.cs b/mcs/class/System.Web/Test/standalone-tests/EnableFormsAuthentication.cs
index ed62e888f60f7412f6a448c03c2a501901b6b8df..94dbd05843865da8fe8fe3ac4aeb866d1bcbf4cb 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/EnableFormsAuthentication.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/EnableFormsAuthentication.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -320,4 +319,3 @@ namespace StandAloneTests.EnableFormsAuthentication
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/standalone-tests/GridViewShowHeaderWhenEmpty.cs b/mcs/class/System.Web/Test/standalone-tests/GridViewShowHeaderWhenEmpty.cs
index 886a5da5d6db7c39327913e1f2bcf48d55f03a6c..59f35580363c5f9289868d959f14954aa9cd92eb 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/GridViewShowHeaderWhenEmpty.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/GridViewShowHeaderWhenEmpty.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -84,4 +83,3 @@ namespace StandAloneTests.GridViewShowHeaderWhenEmpty
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/standalone-tests/GridViewSortingStyles.cs b/mcs/class/System.Web/Test/standalone-tests/GridViewSortingStyles.cs
index 4ccdf70d7ebf35b1e33ca594692bae1aa89cbcf1..568d1f381f1d1e516f0172aebaa77e906abccc6f 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/GridViewSortingStyles.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/GridViewSortingStyles.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -118,4 +117,3 @@ namespace StandAloneTests.GridViewSortingStyles
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/standalone-tests/Menu_4.0_List.cs b/mcs/class/System.Web/Test/standalone-tests/Menu_4.0_List.cs
index cd0ef6a9ade3bc4ea3911949b55c177f645c38ce..f5f4791da2b8185ccc14d42df2d62767f2ce8a44 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/Menu_4.0_List.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/Menu_4.0_List.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -62,4 +61,3 @@ namespace StandAloneTests.Menu_40_List
                }
        }
 }
-#endif

diff --git a/mcs/class/System.Web/Test/standalone-tests/OutputCacheProvider.cs b/mcs/class/System.Web/Test/standalone-tests/OutputCacheProvider.cs
index 88527518a5598055048cbc5800987b00a1569e7c..ccc85f1189d2773a393dc220e29e2f508bd73485 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/OutputCacheProvider.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/OutputCacheProvider.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -163,4 +162,3 @@ Default context: TestAnotherInMemoryProvider
                }
        }
 }
-#endif

diff --git a/mcs/class/System.Web/Test/standalone-tests/PageMetaAttributes.cs b/mcs/class/System.Web/Test/standalone-tests/PageMetaAttributes.cs
index 18f799026e8e6c7bc7167b2108e878c190cce3de..dc745da2aa25860f4a2ab9a99f476aa1dfa452e8 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/PageMetaAttributes.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/PageMetaAttributes.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -64,4 +63,3 @@ namespace StandAloneTests.PageMetaAttributes
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/standalone-tests/PageParserDefaultTypeProperties.cs b/mcs/class/System.Web/Test/standalone-tests/PageParserDefaultTypeProperties.cs
index ff26c312acab56b4ff0cbd8985052d5f68406507..f6674a205438f250be5145d6e878bb809a69a82d 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/PageParserDefaultTypeProperties.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/PageParserDefaultTypeProperties.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -124,4 +123,3 @@ namespace StandAloneTests.PageParserDefaultTypeProperties
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/standalone-tests/RegisterBuildProvider.cs b/mcs/class/System.Web/Test/standalone-tests/RegisterBuildProvider.cs
index bc150d8aae7b5570ba3f2a4bd23fc64b4d66aadb..6e9f5f685c43fc0175d5ec8581788c0264449098 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/RegisterBuildProvider.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/RegisterBuildProvider.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -84,4 +83,3 @@ namespace StandAloneTests.RegisterBuildProvider
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System.Web/Test/standalone-tests/RequestValidator.cs b/mcs/class/System.Web/Test/standalone-tests/RequestValidator.cs
index e1d1a540c323056855555b4207deaf1691101df7..4990fb6057b16602725f7396909abaea3bd75bad 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/RequestValidator.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/RequestValidator.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -207,4 +206,3 @@ Request validation source: {3}
        }
 }
 
-#endif

diff --git a/mcs/class/System.Web/Test/standalone-tests/RequestValidatorTestGenerated.cs b/mcs/class/System.Web/Test/standalone-tests/RequestValidatorTestGenerated.cs
index b97112d40fa10e38893b79a4b320119447f7d9de..c37a20cd6f488bca9bee2c954c8d78971b993f04 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/RequestValidatorTestGenerated.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/RequestValidatorTestGenerated.cs
@@ -1,4 +1,4 @@
-#if NET_4_0
+
 using System;
 using System.Collections.Generic;
 
@@ -258,4 +258,3 @@ namespace StandAloneTests.RequestValidator.Generated
                }
        }
 }
-#endif

diff --git a/mcs/class/System.Web/Test/standalone-tests/Unhandled_Exception_Global_Asax.cs b/mcs/class/System.Web/Test/standalone-tests/Unhandled_Exception_Global_Asax.cs
index 96ac8cdc576e419815ab5a2c07ad70dae0bb9f19..74f7794f165347943b082cbb33ae7026873da21d 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/Unhandled_Exception_Global_Asax.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/Unhandled_Exception_Global_Asax.cs
@@ -65,11 +65,7 @@ namespace StandAloneTests.Unhandled_Exception_Global_Asax
 
                void Default_Aspx (string result, TestRunItem runItem)
                {
-#if NET_4_0
                        string originalHtml1 = @"[System.Web.HttpUnhandledException]: Exception of type 'System.Web.HttpUnhandledException' was thrown.";
-#else
-                       string originalHtml1 = @"[System.Web.HttpUnhandledException]: Exception of type 'System.Web.HttpUnhandledException' was thrown.";
-#endif
                        string originalHtml2 = @"[System.InvalidOperationException]: test";
                        
                        Assert.IsTrue (result.IndexOf (originalHtml1) != -1, "#A1");

diff --git a/mcs/class/System.Web/Test/standalone-tests/WebControlsMustUseIsEnabled_Bug571715.cs b/mcs/class/System.Web/Test/standalone-tests/WebControlsMustUseIsEnabled_Bug571715.cs
index 7632d2ae1c137b427c17e56fbdd34cb3eb96708b..6dc87ed8fe80b3ba3ad240bf9b9a68d254f70818 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/WebControlsMustUseIsEnabled_Bug571715.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/WebControlsMustUseIsEnabled_Bug571715.cs
@@ -58,11 +58,7 @@ namespace StandAloneTests.WebControlsMustUseIsEnabled_Bug571715
 
                void Default_Aspx (string result, TestRunItem runItem)
                {
-#if NET_4_0
                        string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"GridView1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">ID</th><th scope=\"col\">FULLNAME</th><th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>1</td><td>Sheryl Hunter</td><td align=\"left\" style=\"width:60px;\"><input type=\"submit\" name=\"GridView1$ctl02$DeleteBtn\" value=\"Delete\" id=\"GridView1_DeleteBtn_0\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>2</td><td>Dean Straight</td><td class=\"aspNetDisabled\" align=\"left\" style=\"width:60px;\"><input type=\"submit\" name=\"GridView1$ctl03$DeleteBtn\" value=\"Delete\" disabled=\"disabled\" id=\"GridView1_DeleteBtn_1\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>3</td><td>Marjorie Green</td><td align=\"left\" style=\"width:60px;\"><input type=\"submit\" name=\"GridView1$ctl04$DeleteBtn\" value=\"Delete\" id=\"GridView1_DeleteBtn_2\" /></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-                       string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"GridView1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">ID</th><th scope=\"col\">FULLNAME</th><th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>1</td><td>Sheryl Hunter</td><td align=\"left\" style=\"width:60px;\"><input type=\"submit\" name=\"GridView1$ctl02$DeleteBtn\" value=\"Delete\" id=\"GridView1_ctl02_DeleteBtn\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>2</td><td>Dean Straight</td><td disabled=\"disabled\" align=\"left\" style=\"width:60px;\"><input type=\"submit\" name=\"GridView1$ctl03$DeleteBtn\" value=\"Delete\" disabled=\"disabled\" id=\"GridView1_ctl03_DeleteBtn\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>3</td><td>Marjorie Green</td><td align=\"left\" style=\"width:60px;\"><input type=\"submit\" name=\"GridView1$ctl04$DeleteBtn\" value=\"Delete\" id=\"GridView1_ctl04_DeleteBtn\" /></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
                        Helpers.ExtractAndCompareCodeFromHtml (result, originalHtml, "#A1");
                }
        }

diff --git a/mcs/class/System.Web/Test/standalone-tests/WebFormsRouting.cs b/mcs/class/System.Web/Test/standalone-tests/WebFormsRouting.cs
index f6c7f594ff445b773042bc12413363cfea4aaf85..3136a760618f5bf2bcc29889ea06334933d72b91 100644 (file)
--- a/mcs/class/System.Web/Test/standalone-tests/WebFormsRouting.cs
+++ b/mcs/class/System.Web/Test/standalone-tests/WebFormsRouting.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -171,4 +170,3 @@ namespace StandAloneTests.WebFormsRouting
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ConfigUtil.cs b/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ConfigUtil.cs
index 2adfad58ad0b47ac8c37eeef6413daea1d961f74..71eb71e31062c3b5704713a2573ef4caf2fda9c3 100644 (file)
--- a/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ConfigUtil.cs
+++ b/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ConfigUtil.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0 && CONFIGURATION_DEP
+#if CONFIGURATION_DEP
 
 extern alias PrebuiltSystem;
 

diff --git a/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ExtendedProtectionPolicyElement.cs b/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ExtendedProtectionPolicyElement.cs
index 6fa5e8c456631e19346298d211119affc21b5b57..b6a272e93152e8eacdbe66c8c9c43bdcf3a3ef0e 100644 (file)
--- a/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ExtendedProtectionPolicyElement.cs
+++ b/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ExtendedProtectionPolicyElement.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0 && CONFIGURATION_DEP
+#if CONFIGURATION_DEP
 
 using System;
 using System.Collections;

diff --git a/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ServiceNameElement.cs b/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ServiceNameElement.cs
index eb143e9ff80790d40048870c3bcab02d43b3abf8..2e439fea512ef396c4f3f39e70292f05ab3b6063 100644 (file)
--- a/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ServiceNameElement.cs
+++ b/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ServiceNameElement.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0 && CONFIGURATION_DEP
+#if CONFIGURATION_DEP
 
 using System;
 using System.Collections;

diff --git a/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ServiceNameElementCollection.cs b/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ServiceNameElementCollection.cs
index 900bdc5c60af58b044a5aa8cf80f7f9632e2f41c..15a4218ca1939fa8efec066f02431fe2dede8f1b 100644 (file)
--- a/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ServiceNameElementCollection.cs
+++ b/mcs/class/System/System.Security.Authentication.ExtendedProtection.Configuration/ServiceNameElementCollection.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0 && CONFIGURATION_DEP
+#if CONFIGURATION_DEP
 
 using System;
 using System.Collections;

diff --git a/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs b/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
index bf41aeee21af96b1c098b5bb30e596f11cdebb69..6db78941d42aced60c5629666fc5aa3560f68f9b 100644 (file)
--- a/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
+++ b/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // BlockingCollectionTests.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -283,4 +282,3 @@ namespace MonoTests.System.Collections.Concurrent
                }
        }
 }
-#endif

diff --git a/mcs/class/System/Test/System.Collections.Concurrent/CollectionStressTestHelper.cs b/mcs/class/System/Test/System.Collections.Concurrent/CollectionStressTestHelper.cs
index c613fc1eece4b251b05f755dde600a24bbc4d430..8dfb779b15e5f1995b8e3b5ce65a33851170bc5c 100644 (file)
--- a/mcs/class/System/Test/System.Collections.Concurrent/CollectionStressTestHelper.cs
+++ b/mcs/class/System/Test/System.Collections.Concurrent/CollectionStressTestHelper.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // CollectionStressTestHelper.cs
 //  
@@ -131,4 +130,3 @@ namespace MonoTests.System.Collections.Concurrent
                }
        }
 }
-#endif

diff --git a/mcs/class/System/Test/System.Collections.Concurrent/ConcurrentBagTests.cs b/mcs/class/System/Test/System.Collections.Concurrent/ConcurrentBagTests.cs
index f947442627f51d74f5837d06248c97241cf60edd..7f7c9ece2aff9c3613a09595473b60e9c68585bd 100644 (file)
--- a/mcs/class/System/Test/System.Collections.Concurrent/ConcurrentBagTests.cs
+++ b/mcs/class/System/Test/System.Collections.Concurrent/ConcurrentBagTests.cs
@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 
 using System;
 using System.Collections;
@@ -265,4 +264,3 @@ namespace MonoTests.System.Collections.Concurrent
                }
        }
 }
-#endif

diff --git a/mcs/class/System/Test/System.Collections.Concurrent/ParallelTestHelper.cs b/mcs/class/System/Test/System.Collections.Concurrent/ParallelTestHelper.cs
index fbc438626e7265b81e84a26bf6be01255d48e198..4f02f90e976ad3d333a8eac245fac80cb8ea42d5 100644 (file)
--- a/mcs/class/System/Test/System.Collections.Concurrent/ParallelTestHelper.cs
+++ b/mcs/class/System/Test/System.Collections.Concurrent/ParallelTestHelper.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // TestHelper.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -86,4 +85,3 @@ namespace MonoTests.System.Collections.Concurrent
                }
        }
 }
-#endif

diff --git a/mcs/class/System/Test/System.Collections.Generic/SortedSetTest.cs b/mcs/class/System/Test/System.Collections.Generic/SortedSetTest.cs
index f287da56cf00379b47c17d3fa748cfe8b6a167f3..60a34d36c4390d76c3ba7aa00c1cfb3f829f4f43 100644 (file)
--- a/mcs/class/System/Test/System.Collections.Generic/SortedSetTest.cs
+++ b/mcs/class/System/Test/System.Collections.Generic/SortedSetTest.cs
@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.Collections;
@@ -540,4 +539,3 @@ namespace MonoTests.System.Collections.Generic
        }
 }
 
-#endif

diff --git a/mcs/class/System/Test/System.Collections.ObjectModel/CollectionChangedEventValidators.cs b/mcs/class/System/Test/System.Collections.ObjectModel/CollectionChangedEventValidators.cs
index ff723d197f82b79a7eef37947c996573cd00d599..6ff371256e87776deff8b50e43f352eaa70d7bff 100644 (file)
--- a/mcs/class/System/Test/System.Collections.ObjectModel/CollectionChangedEventValidators.cs
+++ b/mcs/class/System/Test/System.Collections.ObjectModel/CollectionChangedEventValidators.cs
@@ -21,7 +21,6 @@
 //     Brian O'Keefe (zer0keefie@gmail.com)
 //
 
-#if NET_4_0
 
 using System.Collections;
 using NUnit.Framework;
@@ -102,4 +101,3 @@ namespace MonoTests.System.Collections.Specialized {
        }
 }
 
-#endif
\ No newline at end of file

diff --git a/mcs/class/System/Test/System.Collections.ObjectModel/ObservableCollectionTest.cs b/mcs/class/System/Test/System.Collections.ObjectModel/ObservableCollectionTest.cs
index 3f66d3edadbc390962aacc39fea29f19b756c579..1c2978942834ee9953f11abb56059c6c3bc5ede4 100644 (file)
--- a/mcs/class/System/Test/System.Collections.ObjectModel/ObservableCollectionTest.cs
+++ b/mcs/class/System/Test/System.Collections.ObjectModel/ObservableCollectionTest.cs
@@ -26,7 +26,6 @@
 //     Marek Safar (marek.safar@gmail.com)
 //
 
-#if NET_4_0
 
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
@@ -349,4 +348,3 @@ namespace MonoTests.System.Collections.ObjectModel {
        }
 }
 
-#endif
\ No newline at end of file

diff --git a/mcs/class/System/Test/System.Collections.ObjectModel/ReadOnlyObservableCollectionTest.cs b/mcs/class/System/Test/System.Collections.ObjectModel/ReadOnlyObservableCollectionTest.cs
index 213c10baaf5fae7042abc4164e05c343e04e6113..665c984bcf74d8e12e058e2f4956dc006fb8aa8b 100644 (file)
--- a/mcs/class/System/Test/System.Collections.ObjectModel/ReadOnlyObservableCollectionTest.cs
+++ b/mcs/class/System/Test/System.Collections.ObjectModel/ReadOnlyObservableCollectionTest.cs
@@ -21,7 +21,6 @@
 //     Brian O'Keefe (zer0keefie@gmail.com)
 //
 
-#if NET_4_0
 
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -93,4 +92,3 @@ namespace MonoTests.System.Collections.ObjectModel {
        }
 }
 
-#endif
\ No newline at end of file

diff --git a/mcs/class/System/Test/System.ComponentModel/AttributeCollectionTest.cs b/mcs/class/System/Test/System.ComponentModel/AttributeCollectionTest.cs
index 9badf4312e856762e7166b63e0378901201750e6..5a524bdf6baaa5a2a8743ad1940e3ca6e053db52 100644 (file)
--- a/mcs/class/System/Test/System.ComponentModel/AttributeCollectionTest.cs
+++ b/mcs/class/System/Test/System.ComponentModel/AttributeCollectionTest.cs
@@ -35,7 +35,6 @@ namespace MonoTests.System.ComponentModel {
        [TestFixture]
        public class AttributeCollectionTest {
 
-#if NET_4_0
                [Test]
                public void Ctor_4_0 ()
                {
@@ -76,7 +75,6 @@ namespace MonoTests.System.ComponentModel {
                                return Attributes;
                        }
                }
-#endif
        }
 }
 

diff --git a/mcs/class/System/Test/System.ComponentModel/CultureInfoConverterTest.cs b/mcs/class/System/Test/System.ComponentModel/CultureInfoConverterTest.cs
index c00738da1b0a236c46f660690484389228c78b21..ca40ccbf41cae6b425d634bca51523a6008ae328 100644 (file)
--- a/mcs/class/System/Test/System.ComponentModel/CultureInfoConverterTest.cs
+++ b/mcs/class/System/Test/System.ComponentModel/CultureInfoConverterTest.cs
@@ -197,7 +197,6 @@ namespace MonoTests.System.ComponentModel
                        }
                }
 
-#if NET_4_0
                [Test]
                public void GetCultureName ()
                {
@@ -217,6 +216,5 @@ namespace MonoTests.System.ComponentModel
                                return base.GetCultureName (culture);
                        }
                }
-#endif
        }
 }

diff --git a/mcs/class/System/Test/System.ComponentModel/DateTimeOffsetConverterTests.cs b/mcs/class/System/Test/System.ComponentModel/DateTimeOffsetConverterTests.cs
index 3d1c3af947d17e4518c3a226b1ababe1dd7ee13f..e869c8d3263c48207317b55115f36c9968d124c1 100644 (file)
--- a/mcs/class/System/Test/System.ComponentModel/DateTimeOffsetConverterTests.cs
+++ b/mcs/class/System/Test/System.ComponentModel/DateTimeOffsetConverterTests.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0 && !MOBILE
+#if !MOBILE
 
 using System;
 using System.ComponentModel;

diff --git a/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs b/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs
index 53dbd7bb9e5ab4f76fccf39a426223a1bb83480d..f81baa6a984c5408debfe0a6da673e2dc2191bce 100644 (file)
--- a/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs
+++ b/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs
@@ -400,10 +400,8 @@ namespace MonoTests.System.ComponentModel
 
 #if MOBILE
                        [TypeConverter("System.ComponentModel.CharConverter, System, Version=2.0.5.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
-#elif NET_4_0
-                       [TypeConverter("System.ComponentModel.CharConverter, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
 #else
-                       [TypeConverter("System.ComponentModel.CharConverter, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
+                       [TypeConverter("System.ComponentModel.CharConverter, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
 #endif
                        public virtual Version WithConverterNamedAssmQuald {
                                get { return null; }

diff --git a/mcs/class/System/Test/System.ComponentModel/TypeDescriptionProviderTest.cs b/mcs/class/System/Test/System.ComponentModel/TypeDescriptionProviderTest.cs
index 1c2a1e5067a2c97c8037494a28b01ce0bfb38c9e..815f7914ab3207e189cdcb4d7a3a9cefa8f3d3d6 100644 (file)
--- a/mcs/class/System/Test/System.ComponentModel/TypeDescriptionProviderTest.cs
+++ b/mcs/class/System/Test/System.ComponentModel/TypeDescriptionProviderTest.cs
@@ -37,7 +37,6 @@ namespace MonoTests.System.ComponentModel
        [TestFixture]
        public class TypeDescriptionProviderTest
        {
-#if NET_4_0
                [Test]
                public void IsSupportedType ()
                {
@@ -71,7 +70,6 @@ namespace MonoTests.System.ComponentModel
                                return base.GetExtenderProviders (instance);
                        }
                }
-#endif
        }
 }
 

diff --git a/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs b/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs
index 6698b50199771d05ca78ea4db076dcb8dc6bf9a0..7842d5c3fe8e036472a1b7f5d573be17d348e46a 100644 (file)
--- a/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs
+++ b/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs
@@ -284,16 +284,7 @@ namespace MonoTests.System.Configuration {
                [Test]
                public void TestSettings2_Properties ()
                {
-                       // This test will fail when there are newer versions
-                       // of the test assemblies - so conditionalize it in
-                       // such cases.
-#if   NET_4_5
                        string expected = "MonoTests.System.Configuration.ProviderPoker, System_test_net_4_x, Version=0.0.0.0";
-#elif NET_4_0
-                       string expected = "MonoTests.System.Configuration.ProviderPoker, System_test_net_4_0, Version=0.0.0.0";
-#else
-                       string expected = "MonoTests.System.Configuration.ProviderPoker, System_test_net_2_0, Version=0.0.0.0";
-#endif
                        Assert.AreEqual (expected, new SettingsProviderAttribute (typeof (ProviderPoker)).ProviderTypeName.Substring (0, expected.Length), "#1");
                        TestSettings2 settings = new TestSettings2 ();
 

diff --git a/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs b/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
index 3a7ce31d0c602f28af3549eefc482fcb33d7e65a..c4296c39e2755329f64c12f3444e9b82699d3dd3 100644 (file)
--- a/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
+++ b/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
@@ -2336,7 +2336,6 @@ namespace MonoTests.System.Net
                        }
                }
 
-#if NET_4_0
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
                public void NullHost ()
@@ -2496,7 +2495,6 @@ namespace MonoTests.System.Net
                                ;
                        }
                }
-#endif
 
 #if NET_4_5
                [Test]
@@ -3309,7 +3307,6 @@ namespace MonoTests.System.Net
                        }
                }
 
-#if NET_4_0
                [Test]
                // Bug6737
                // This test is supposed to fail prior to .NET 4.0
@@ -3322,7 +3319,6 @@ namespace MonoTests.System.Net
                        var gr = wr.BeginGetResponse (delegate { }, null);
                        Assert.AreEqual (true, gr.AsyncWaitHandle.WaitOne (5000), "#1");
                }
-#endif
        }
 
        static class StreamExtensions {

diff --git a/mcs/class/System/Test/System.Net/IPAddressTest.cs b/mcs/class/System/Test/System.Net/IPAddressTest.cs
index a133684a8c63712ac2cde3c88724628287ca0bfc..39866f384b6993f4f824505b373a9980f32936c5 100644 (file)
--- a/mcs/class/System/Test/System.Net/IPAddressTest.cs
+++ b/mcs/class/System/Test/System.Net/IPAddressTest.cs
@@ -613,7 +613,6 @@ public class IPAddressTest
                Assert.IsFalse (IPAddress.Parse ("FE00::1").IsIPv6Multicast, "#3");
        }
 
-#if NET_4_0
        [Test]
        public void IsIPv6Teredo ()
        {
@@ -640,7 +639,6 @@ public class IPAddressTest
                        }
                }
        }
-#endif
 }
 }
 

diff --git a/mcs/class/System/Test/System.Net/WebClientTest.cs b/mcs/class/System/Test/System.Net/WebClientTest.cs
index e53cc45e8258c95eebcadf16e3cc0bc7d0e31524..4b42be97f22f5ab5fc052097ed1a42e5a61da720 100644 (file)
--- a/mcs/class/System/Test/System.Net/WebClientTest.cs
+++ b/mcs/class/System/Test/System.Net/WebClientTest.cs
@@ -1875,7 +1875,6 @@ namespace MonoTests.System.Net
                }
 #endif
 
-#if NET_4_0
                public void UploadAsyncCancelEventTest (int port, Action<WebClient, Uri, EventWaitHandle> uploadAction)
                {
                        var ep = NetworkHelpers.LocalEphemeralEndPoint ();
@@ -1899,6 +1898,5 @@ namespace MonoTests.System.Net
                                Assert.IsTrue (cancelEvent.WaitOne (1000));
                        }
                }
-#endif
        }
 }

diff --git a/mcs/class/System/Test/System.Net/WebHeaderCollectionTest.cs b/mcs/class/System/Test/System.Net/WebHeaderCollectionTest.cs
index 9e4792acb94d12ae859687586c5b0a328e8ad967..2e46d997aa7fad962ecdf219a5e0230d9691f789 100644 (file)
--- a/mcs/class/System/Test/System.Net/WebHeaderCollectionTest.cs
+++ b/mcs/class/System/Test/System.Net/WebHeaderCollectionTest.cs
@@ -373,10 +373,8 @@ namespace MonoTests.System.Net
                        0x49, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2c, 0x20, 0x56, 0x65,
 #if MOBILE
                        0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x32, 0x2e, 0x30, 0x2e, 0x35,
-#elif NET_4_0
-                       0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x34, 0x2e, 0x30, 0x2e, 0x30,
 #else
-                       0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x32, 0x2e, 0x30, 0x2e, 0x30,
+                       0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x34, 0x2e, 0x30, 0x2e, 0x30,
 #endif
                        0x2e, 0x30, 0x2c, 0x20, 0x43, 0x75, 0x6c, 0x74, 0x75, 0x72, 0x65,
                        0x3d, 0x6e, 0x65, 0x75, 0x74, 0x72, 0x61, 0x6c, 0x2c, 0x20, 0x50,

diff --git a/mcs/class/System/Test/System.Net/WebPermissionTest.cs b/mcs/class/System/Test/System.Net/WebPermissionTest.cs
index 39d7045ca0dd6bf57dc9e9c6cc21666f9692d950..e7d8f20000dd4a7fffa5906d75e1f9daa0777b7a 100644 (file)
--- a/mcs/class/System/Test/System.Net/WebPermissionTest.cs
+++ b/mcs/class/System/Test/System.Net/WebPermissionTest.cs
@@ -45,7 +45,6 @@ namespace MonoTests.System.Net {
                [Test]
                public void Serialization ()
                {
-#if NET_4_0
                        string result1 = "<IPermission class=\"System.Net.WebPermission, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089\"\n" + 
 "version=\"1\">\n" + 
 "<ConnectAccess>\n" + 
@@ -59,21 +58,6 @@ namespace MonoTests.System.Net {
 "<URI uri=\"Hello\"/>\n" + 
 "</AcceptAccess>\n" + 
 "</IPermission>\n";
-#else
-                       string result1 = "<IPermission class=\"System.Net.WebPermission, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089\"\n" + 
-"version=\"1\">\n" + 
-"<ConnectAccess>\n" + 
-"<URI uri=\"Hello\"/>\n" + 
-"</ConnectAccess>\n" + 
-"</IPermission>\n";
-
-                       string result2 = "<IPermission class=\"System.Net.WebPermission, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089\"\n" + 
-"version=\"1\">\n" + 
-"<AcceptAccess>\n" + 
-"<URI uri=\"Hello\"/>\n" + 
-"</AcceptAccess>\n" + 
-"</IPermission>\n";
-#endif   
                        WebPermission pp = new WebPermission (NetworkAccess.Connect, "Hello");
                        Assert.AreEqual (result1, pp.ToXml ().ToString ().Replace ("\r", ""));
                        

diff --git a/mcs/class/System/Test/System.Net/WebUtilityTest.cs b/mcs/class/System/Test/System.Net/WebUtilityTest.cs
index eb5c5c5fd711ff7007b59574cc844e70fd31d905..5c97cb2fced677f58b670ecf966a07620169f597 100644 (file)
--- a/mcs/class/System/Test/System.Net/WebUtilityTest.cs
+++ b/mcs/class/System/Test/System.Net/WebUtilityTest.cs
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0 && !MOBILE
+#if !MOBILE
 
 using System;
 using System.Text;

diff --git a/mcs/class/System/Test/System.Runtime.Versioning/FrameworkNameTest.cs b/mcs/class/System/Test/System.Runtime.Versioning/FrameworkNameTest.cs
index cb138dec00388e5716201dd56bb53ad37e429b5c..2ce9cfef8f3740dbe50bcb224251c1aa9650cb8d 100644 (file)
--- a/mcs/class/System/Test/System.Runtime.Versioning/FrameworkNameTest.cs
+++ b/mcs/class/System/Test/System.Runtime.Versioning/FrameworkNameTest.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0 && !MOBILE
+#if !MOBILE
 
 using System;
 using System.Runtime.Versioning;

diff --git a/mcs/class/System/Test/System.Threading/BarrierTest.cs b/mcs/class/System/Test/System.Threading/BarrierTest.cs
index 4a41e9ea8408829c6796a34028961553c00a57ed..9ad60070196ee98e96ddf141c8648b84ea903761 100644 (file)
--- a/mcs/class/System/Test/System.Threading/BarrierTest.cs
+++ b/mcs/class/System/Test/System.Threading/BarrierTest.cs
@@ -23,7 +23,6 @@
 //
 
 
-#if NET_4_0
 
 using NUnit.Framework;
 
@@ -97,4 +96,3 @@ namespace MonoTests.System.Threading {
        }
 }
 
-#endif

diff --git a/mcs/class/System/Test/System/UriBuilderTest.cs b/mcs/class/System/Test/System/UriBuilderTest.cs
index 976620ce2c0845550afb291b407ea826145e89bc..d2c19e49830c1b32663bc58d826a8ef85776645b 100644 (file)
--- a/mcs/class/System/Test/System/UriBuilderTest.cs
+++ b/mcs/class/System/Test/System/UriBuilderTest.cs
@@ -88,11 +88,7 @@ namespace MonoTests.System
                }
 
                [Test] // ctor (Uri)
-#if NET_4_0
                [ExpectedException (typeof (ArgumentNullException))]
-#else
-               [ExpectedException (typeof (NullReferenceException))]
-#endif
                public void Constructor2_Uri_Null ()
                {
                        new UriBuilder ((Uri) null);

diff --git a/mcs/class/System/Test/System/UriPermutationsTest.cs b/mcs/class/System/Test/System/UriPermutationsTest.cs
index 1010b6e5c1a370d71cee41730c04d7b528ac36ad..7d9d24052f3c985d4df6f82244ac578051a3e92b 100644 (file)
--- a/mcs/class/System/Test/System/UriPermutationsTest.cs
+++ b/mcs/class/System/Test/System/UriPermutationsTest.cs
@@ -64,10 +64,8 @@ namespace MonoTests.System {
                        StringTester.CreateMode = createMode;
 #if NET_4_5
                        StringTester.Location = location + "NET_4_5";
-#elif NET_4_0
-                       StringTester.Location = location + "NET_4_0";
 #else
-                       StringTester.Location = location + "NET_2_0";
+                       StringTester.Location = location + "NET_4_0";
 #endif
                }
 

diff --git a/mcs/class/System/Test/System/UriTest.cs b/mcs/class/System/Test/System/UriTest.cs
index e9a92244f63c27b1eb745d3c792d8fdb6cbae586..1a261938e9c27227948d0bc9d15cb95daf461bbb 100644 (file)
--- a/mcs/class/System/Test/System/UriTest.cs
+++ b/mcs/class/System/Test/System/UriTest.cs
@@ -176,10 +176,6 @@ namespace MonoTests.System
 
                        uri = new Uri (new Uri("http://www.xxx.com"), "?x=0");
                        Assert.AreEqual ("http://www.xxx.com/?x=0", uri.ToString(), "#rel30");
-#if !NET_4_0
-                       uri = new Uri (new Uri("http://www.xxx.com/index.htm"), "?x=0");
-                       Assert.AreEqual ("http://www.xxx.com/?x=0", uri.ToString(), "#rel31");
-#endif
                        uri = new Uri (new Uri("http://www.xxx.com/index.htm"), "#here");
                        Assert.AreEqual ("http://www.xxx.com/index.htm#here", uri.ToString(), "#rel32");
 
@@ -243,9 +239,6 @@ namespace MonoTests.System
                        Uri b = new Uri ("http://a/b/c/d;p?q");
                        Assert.AreEqual ("http://a/g", new Uri (b, "/g").ToString (), "#1");
                        Assert.AreEqual ("http://g/", new Uri (b, "//g").ToString (), "#2");
-#if !NET_4_0
-                       Assert.AreEqual ("http://a/b/c/?y", new Uri (b, "?y").ToString (), "#3");
-#endif
                        Assert.IsTrue (new Uri (b, "#s").ToString ().EndsWith ("#s"), "#4");
 
                        Uri u = new Uri (b, "/g?q=r");
@@ -702,13 +695,8 @@ namespace MonoTests.System
                        Assert.AreEqual ("c#", UriEx.UnescapeString ("file://localhost/c#", "c%23"), "#2");
                        Assert.AreEqual ("#", UriEx.UnescapeString ("http://localhost/c#", "%23"), "#1");
                        Assert.AreEqual ("c#", UriEx.UnescapeString ("http://localhost/c#", "c%23"), "#2");
-#if NET_4_0
                        Assert.AreEqual ("%A9", UriEx.UnescapeString ("file://localhost/c#", "%A9"), "#3");
                        Assert.AreEqual ("%A9", UriEx.UnescapeString ("http://localhost/c#", "%A9"), "#3");
-#else
-                       Assert.AreEqual ("\xA9", UriEx.UnescapeString ("file://localhost/c#", "%A9"), "#3");
-                       Assert.AreEqual ("\xA9", UriEx.UnescapeString ("http://localhost/c#", "%A9"), "#3");
-#endif
                }
 
                [Test]
@@ -784,13 +772,7 @@ namespace MonoTests.System
                        // 2-byte escape sequence, 2 individual characters
                        uri = new Uri ("file:///foo/a%C2%F8b", true);
                        path = uri.LocalPath;
-#if NET_4_0
                        Assert.AreEqual ("/foo/a%C2%F8b", path, "#7");
-#else
-                       Assert.AreEqual (9, path.Length, "#7");
-                       Assert.AreEqual (0xC2, path [6], "#8");
-                       Assert.AreEqual (0xF8, path [7], "#9");
-#endif
                }
 
                [Test]
@@ -1527,10 +1509,6 @@ namespace MonoTests.System
                        Assert.AreEqual (
                                "%00%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%20%21%22%23%24%25%26%27%28%29%2A%2B%2C-.%2F0123456789%3A%3B%3C%3D%3E%3F%40ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D~%7F",
                                Uri.EscapeDataString (sb.ToString ()));
-#elif NET_4_0
-                       Assert.AreEqual (
-                               "%00%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%20!%22%23%24%25%26'()*%2B%2C-.%2F0123456789%3A%3B%3C%3D%3E%3F%40ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D~%7F",
-                               Uri.EscapeDataString (sb.ToString ()));
 #else
                        Assert.AreEqual (
                                "%00%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%20!%22%23%24%25%26'()*%2B%2C-.%2F0123456789%3A%3B%3C%3D%3E%3F%40ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D~%7F",
@@ -1550,10 +1528,6 @@ namespace MonoTests.System
                        Assert.AreEqual (
                                "%00%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%20!%22#$%25&'()*+,-./0123456789:;%3C=%3E?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[%5C]%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D~%7F",
                                Uri.EscapeUriString (sb.ToString ()));
-#elif NET_4_0
-                       Assert.AreEqual (
-                               "%00%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%20!%22#$%25&'()*+,-./0123456789:;%3C=%3E?@ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D~%7F",
-                               Uri.EscapeUriString (sb.ToString ()));
 #else
                        Assert.AreEqual (
                                "%00%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%20!%22#$%25&'()*+,-./0123456789:;%3C=%3E?@ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D~%7F",

diff --git a/mcs/class/System/Test/System/UriTest2.cs b/mcs/class/System/Test/System/UriTest2.cs
index e3a4530e0c653230592e85ac46a8ef6a7c354ce3..cbec7b2fc52d5ddbd7b4ca485d6e9e2685196828 100644 (file)
--- a/mcs/class/System/Test/System/UriTest2.cs
+++ b/mcs/class/System/Test/System/UriTest2.cs
@@ -577,11 +577,7 @@ TextWriter sw = Console.Out;
 
                        Uri merged = new Uri (absolute, "?moon");
                        Assert.AreEqual ("?moon", merged.Query, "merged.Query");
-#if NET_4_0
                        Assert.AreEqual ("http://host/dir/subdir/weird;name?moon", merged.ToString (), "merged.ToString");
-#else
-                       Assert.AreEqual ("http://host/dir/subdir/?moon", merged.ToString (), "merged.ToString");
-#endif
                }
 
                [Test]

diff --git a/mcs/class/System/Test/System/UriTest3.cs b/mcs/class/System/Test/System/UriTest3.cs
index 7ff8924d0daaed4c9091dbdcbba456fa6b3a0323..9b2e93b730cdb572d1d230c1da5f8566e66c9087 100644 (file)
--- a/mcs/class/System/Test/System/UriTest3.cs
+++ b/mcs/class/System/Test/System/UriTest3.cs
@@ -297,16 +297,10 @@ namespace MonoTests.System
                        Uri baseUri = new Uri (absolute);
                        try {
                                Uri.TryCreate (baseUri, (Uri) null, out uri);
-#if NET_4_0
                                Assert.IsNull (uri);
-#else
-                               Assert.Fail ("throw NRE under FX 2.0");
-#endif
                        }
                        catch (NullReferenceException) {
-#if NET_4_0
                                Assert.Fail ("does not throw NRE under FX 4.0");
-#endif
                        }
                }
 
@@ -549,7 +543,6 @@ namespace MonoTests.System
                                uri.MakeRelativeUri ((Uri) null);
                                Assert.Fail ("#1");
                        }
-#if NET_4_0
                        catch (ArgumentNullException ex) {
                                Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
                                Assert.IsNull (ex.InnerException, "#3");
@@ -557,11 +550,6 @@ namespace MonoTests.System
                                Assert.IsNotNull (ex.ParamName, "#5");
                                Assert.AreEqual ("uri", ex.ParamName, "#6");
                        }
-#else
-                       catch (NullReferenceException) {
-                               // https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=299942
-                       }
-#endif
                }
 
                [Test] // LAMESPEC: see bug #321113

diff --git a/mcs/class/WebMatrix.Data/Test/WebMatrix.Data/ConnectionEventArgsTests.cs b/mcs/class/WebMatrix.Data/Test/WebMatrix.Data/ConnectionEventArgsTests.cs
index 8c24401d206e946ba31511989d8b8ab61c9b14db..dd09b681c5abf5e4eaad99644bd893c69008094d 100644 (file)
--- a/mcs/class/WebMatrix.Data/Test/WebMatrix.Data/ConnectionEventArgsTests.cs
+++ b/mcs/class/WebMatrix.Data/Test/WebMatrix.Data/ConnectionEventArgsTests.cs
@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 
 using System;
 using System.Data.Common;
@@ -51,4 +50,3 @@ namespace MonoTests.WebMatrix.Data
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/WebMatrix.Data/Test/WebMatrix.Data/DatabaseTests.cs b/mcs/class/WebMatrix.Data/Test/WebMatrix.Data/DatabaseTests.cs
index 135d4de8ca0b57d1806948520c1c978d4e0fe1f3..a034e7ea029faba59982a429c6564b980c9b2596 100644 (file)
--- a/mcs/class/WebMatrix.Data/Test/WebMatrix.Data/DatabaseTests.cs
+++ b/mcs/class/WebMatrix.Data/Test/WebMatrix.Data/DatabaseTests.cs
@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 
 using System;
 using System.IO;
@@ -114,4 +113,3 @@ namespace MonoTests.WebMatrix.Data
                }
        }
 }
-#endif

diff --git a/mcs/class/WebMatrix.Data/Test/WebMatrix.Data/DynamicRecordTests.cs b/mcs/class/WebMatrix.Data/Test/WebMatrix.Data/DynamicRecordTests.cs
index c180ca2e24e5374db65ae7fd1e295a6e57d11fed..59996ce97becf31b63f65108be40fc48b7acfae2 100644 (file)
--- a/mcs/class/WebMatrix.Data/Test/WebMatrix.Data/DynamicRecordTests.cs
+++ b/mcs/class/WebMatrix.Data/Test/WebMatrix.Data/DynamicRecordTests.cs
@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 
 using System;
 using System.Collections.Generic;
@@ -96,4 +95,3 @@ namespace MonoTests.WebMatrix.Data
                }
        }
 }
-#endif

diff --git a/mcs/class/WindowsBase/Test/System.Windows.Markup/DateTimeValueSerializerTest.cs b/mcs/class/WindowsBase/Test/System.Windows.Markup/DateTimeValueSerializerTest.cs
index 6a77804eb48f745a9d3a7814286457d1be515997..c859a9f207bd039e730d1caa2cd411563922ebb6 100644 (file)
--- a/mcs/class/WindowsBase/Test/System.Windows.Markup/DateTimeValueSerializerTest.cs
+++ b/mcs/class/WindowsBase/Test/System.Windows.Markup/DateTimeValueSerializerTest.cs
@@ -88,13 +88,11 @@ namespace MonoTests.System.Windows.Markup {
                }
 
                [Test]
-#if NET_4_0
                [NUnit.Framework.CategoryAttribute ("NotWorking")]
                // Since ValueSerializer has moved to System.Xaml.dll while the type
                // this test expects is in WindowsBase, there should be some additional
                // support code in this assembly. Until someone does that job, this
                // test won't pass.
-#endif
                public void CanConvertFromString ()
                {
                        Context context = new Context ();
@@ -107,13 +105,11 @@ namespace MonoTests.System.Windows.Markup {
                        Assert.IsTrue (serializer.CanConvertFromString ("2008-01-.106426-08:00", context), "4");
                }
 
-#if NET_4_0
                [NUnit.Framework.CategoryAttribute ("NotWorking")]
                // Since ValueSerializer has moved to System.Xaml.dll while the type
                // this test expects is in WindowsBase, there should be some additional
                // support code in this assembly. Until someone does that job, this
                // test won't pass.
-#endif
                [Test]
                [ExpectedException (typeof (ArgumentException))] // Expected object of type 'DateTime'.
                public void CanConvertToString1 ()

diff --git a/mcs/class/WindowsBase/Test/System.Windows.Markup/ValueSerializerTest.cs b/mcs/class/WindowsBase/Test/System.Windows.Markup/ValueSerializerTest.cs
index eda87c17d9f92fb2a8e408ad9cbcc6f56e3ec826..7c898702a95ce094a0b7b5828ae485e842c94e67 100644 (file)
--- a/mcs/class/WindowsBase/Test/System.Windows.Markup/ValueSerializerTest.cs
+++ b/mcs/class/WindowsBase/Test/System.Windows.Markup/ValueSerializerTest.cs
@@ -76,13 +76,11 @@ namespace MonoTests.System.Windows.Markup {
                }
 
                [Test]
-#if NET_4_0
                [NUnit.Framework.CategoryAttribute ("NotWorking")]
                // Since ValueSerializer has moved to System.Xaml.dll while the type
                // this test expects is in WindowsBase, there should be some additional
                // support code in this assembly. Until someone does that job, this
                // test won't pass.
-#endif
                public void GetSerializerForType ()
                {
                        Assert.IsNull (ValueSerializer.GetSerializerFor (typeof (DependencyObject)));

diff --git a/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs b/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs
index 7279f715f7b56052c864f30e9d57bc1123818ad0..7479bc775b28da65130781710df3ce18d64e9e33 100755 (executable)
--- a/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs
+++ b/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs
@@ -657,7 +657,6 @@ namespace MonoTests.Microsoft.Win32
                        }
                }
 
-#if NET_4_0
                // Unfortunately we can't test that the scenario where a volatile
                // key is not alive after a reboot, but we can test other bits.
                [Test]
@@ -818,7 +817,6 @@ namespace MonoTests.Microsoft.Win32
                        }
 
                }
-#endif
 
                [Test]
                public void DeleteSubKey ()
@@ -1109,7 +1107,6 @@ namespace MonoTests.Microsoft.Win32
                        }
                }
 
-#if NET_4_0
                [Test]
                public void DeleteSubKeyTree_Key_DoesNotExist_Overload ()
                {
@@ -1128,7 +1125,6 @@ namespace MonoTests.Microsoft.Win32
                        // It's enough to know this line is not throwing an exception.
                        Registry.CurrentUser.DeleteSubKey (subKeyName, false);
                }
-#endif
 
                [Test]
                public void DeleteSubKeyTree_Key_ReadOnly ()
@@ -1658,7 +1654,6 @@ namespace MonoTests.Microsoft.Win32
                        }
                }
 
-#if NET_4_0
                [DllImport ("advapi32.dll", CharSet = CharSet.Unicode)]
                static extern int RegOpenKeyEx (IntPtr keyBase, string keyName, IntPtr reserved, int access, out IntPtr keyHandle);
         
@@ -1752,7 +1747,6 @@ namespace MonoTests.Microsoft.Win32
                                }
                        }
                }
-#endif
 
                [Test]
                public void GetValue ()

diff --git a/mcs/class/corlib/Test/System.Collections.Concurrent/CollectionStressTestHelper.cs b/mcs/class/corlib/Test/System.Collections.Concurrent/CollectionStressTestHelper.cs
index 70ca28d1ed5b9211c8f40c083d1e2c3155120353..4a314e738fc68bdecafe860344a0245aedcd8645 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections.Concurrent/CollectionStressTestHelper.cs
+++ b/mcs/class/corlib/Test/System.Collections.Concurrent/CollectionStressTestHelper.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // CollectionStressTestHelper.cs
 //  
@@ -126,4 +125,3 @@ namespace MonoTests.System.Collections.Concurrent
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs b/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
index e38c904590094c4d205afd198fea736b31ea4bdd..70c250d015da682354eb25b303d108380f06759e 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
+++ b/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // ConcurrentDictionaryTests.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -368,4 +367,3 @@ namespace MonoTests.System.Collections.Concurrent
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentQueueTests.cs b/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentQueueTests.cs
index 91436a05b2127ccce3817228f27378facd793db7..a6351e511f3a440738dca3d39766f6aca7ca8a2a 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentQueueTests.cs
+++ b/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentQueueTests.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // ConcurrentQueueTest.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -270,4 +269,3 @@ namespace MonoTests.System.Collections.Concurrent
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentStackTests.cs b/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentStackTests.cs
index ad22068717538591f3c024248ee7673940d6cac2..4086ede09d1b0941e7ce1887dd22da9eab99e6ac 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentStackTests.cs
+++ b/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentStackTests.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // ConcurrentStackTests.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -303,4 +302,3 @@ namespace MonoTests.System.Collections.Concurrent
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Collections.Concurrent/ParallelConcurrentQueueTests.cs b/mcs/class/corlib/Test/System.Collections.Concurrent/ParallelConcurrentQueueTests.cs
index 32c6b483b99dfd642bac2b2ac02d3700231e6b9d..5f5abb60de01ba3664ec9fdac895960445fb8cd1 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections.Concurrent/ParallelConcurrentQueueTests.cs
+++ b/mcs/class/corlib/Test/System.Collections.Concurrent/ParallelConcurrentQueueTests.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // ParallelConcurrentQueueTests.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -56,4 +55,3 @@ namespace MonoTests.System.Collections.Concurrent
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Collections.Concurrent/ParallelConcurrentStackTests.cs b/mcs/class/corlib/Test/System.Collections.Concurrent/ParallelConcurrentStackTests.cs
index 3d1918461f2b6337787b62b179ece4140f35f316..ef7758c244d8d04087b903bcf9f21f49a8a0b6b0 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections.Concurrent/ParallelConcurrentStackTests.cs
+++ b/mcs/class/corlib/Test/System.Collections.Concurrent/ParallelConcurrentStackTests.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // ParallelConcurrentStackTests.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -59,4 +58,3 @@ namespace MonoTests.System.Collections.Concurrent
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Collections.Concurrent/PartitionerTests.cs b/mcs/class/corlib/Test/System.Collections.Concurrent/PartitionerTests.cs
index 99ada6548b2d5b75b496a6484d570dc958cb7e33..9cd2d1e11136e2e8cb6841595af01cb0ba7f71e9 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections.Concurrent/PartitionerTests.cs
+++ b/mcs/class/corlib/Test/System.Collections.Concurrent/PartitionerTests.cs
@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 
 using System;
 using System.Collections.Generic;
@@ -93,4 +92,3 @@ namespace MonoTests.System.Collections.Concurrent
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Collections.Generic/ComparerTest.cs b/mcs/class/corlib/Test/System.Collections.Generic/ComparerTest.cs
index 1aaad7d022c5f1967689d30d80d2df7f7757541b..b5d78b7571eb7790a9669ef86e28fd90d39d942e 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections.Generic/ComparerTest.cs
+++ b/mcs/class/corlib/Test/System.Collections.Generic/ComparerTest.cs
@@ -95,25 +95,6 @@ namespace MonoTests.System.Collections.Generic
                }
 
 
-#if !NET_4_0 // FIXME: the blob contains the 2.0 mscorlib version
-
-               [Test] // bug #80929
-               public void SerializeDefault ()
-               {
-                       Comparer<int> c = Comparer<int>.Default;
-
-                       BinaryFormatter bf = new BinaryFormatter ();
-                       MemoryStream ms = new MemoryStream ();
-                       bf.Serialize (ms, c);
-
-                       byte [] buffer = new byte [ms.Length];
-                       ms.Position = 0;
-                       ms.Read (buffer, 0, buffer.Length);
-
-                       Assert.AreEqual (_serializedDefault, buffer);
-               }
-
-#endif
 
                [Test]
                public void DeserializeDefault ()

diff --git a/mcs/class/corlib/Test/System.Collections.Generic/ListTest.cs b/mcs/class/corlib/Test/System.Collections.Generic/ListTest.cs
index 836e72e493760457d76a421efce279fc1355cc5f..be1f8f92729705b768877e3376a82ebb6e1ae6f7 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections.Generic/ListTest.cs
+++ b/mcs/class/corlib/Test/System.Collections.Generic/ListTest.cs
@@ -342,28 +342,6 @@ namespace MonoTests.System.Collections.Generic {
                        Assert.AreEqual (- (l.Count + 1), l.BinarySearch (int.MaxValue));
                }
 
-#if !NET_4_0 // FIXME: the blob contains the 2.0 mscorlib version
-
-               [Test]
-               public void SerializeTest ()
-               {
-                       List <int> list = new List <int> ();
-                       list.Add (5);
-                       list.Add (0);
-                       list.Add (7);
-
-                       BinaryFormatter bf = new BinaryFormatter ();
-                       MemoryStream ms = new MemoryStream ();
-                       bf.Serialize (ms, list);
-
-                       byte [] buffer = new byte [ms.Length];
-                       ms.Position = 0;
-                       ms.Read (buffer, 0, buffer.Length);
-
-                       Assert.AreEqual (_serializedList, buffer);
-               }
-
-#endif
 
                [Test]
                public void DeserializeTest ()

diff --git a/mcs/class/corlib/Test/System.Collections/StructuralComparisonsTest.cs b/mcs/class/corlib/Test/System.Collections/StructuralComparisonsTest.cs
index 38c9ace965b62331421b5211571084f071fe878c..61b9064e5368fbff8ec41d6c2267b8a7cee82514 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections/StructuralComparisonsTest.cs
+++ b/mcs/class/corlib/Test/System.Collections/StructuralComparisonsTest.cs
@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System.Collections;
 using NUnit.Framework;
@@ -52,4 +51,3 @@ namespace MonoTests.System.Collections
        }
 }
 
-#endif
\ No newline at end of file

diff --git a/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractAssertTest.cs b/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractAssertTest.cs
index f8f3236a7627044f8db852694639d4b14787aa1c..4c7417d53198ee07b7441a5eb1d3b5d5ab371e12 100755 (executable)
--- a/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractAssertTest.cs
+++ b/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractAssertTest.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 
 #define CONTRACTS_FULL
 #define DEBUG
@@ -174,4 +173,3 @@ namespace MonoTests.System.Diagnostics.Contracts {
        }
 }
 
-#endif

diff --git a/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractAssumeTest.cs b/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractAssumeTest.cs
index 0d650184f207e86e3315e8faeae8495feeb69a04..c5d5f6df64d64fc56142fb8fa798c93965bda544 100755 (executable)
--- a/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractAssumeTest.cs
+++ b/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractAssumeTest.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 
 #define CONTRACTS_FULL
 #define DEBUG
@@ -45,4 +44,3 @@ namespace MonoTests.System.Diagnostics.Contracts {
 
 }
 
-#endif

diff --git a/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractCollectionMethodsTest.cs b/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractCollectionMethodsTest.cs
index 81cb1b6387871bd7e8e73acff232014b679bfe0c..7fb3770a50f2e91567603571aaec986488095d95 100644 (file)
--- a/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractCollectionMethodsTest.cs
+++ b/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractCollectionMethodsTest.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 
 #define CONTRACTS_FULL
 #define DEBUG
@@ -126,4 +125,3 @@ namespace MonoTests.System.Diagnostics.Contracts {
 
 }
 
-#endif

diff --git a/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractHelperTest.cs b/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractHelperTest.cs
index 8e770c4682deb3bbdb38d8c74ee4ddb020f324b9..dd5143c24aff46562f5c85526525e9d540e91241 100755 (executable)
--- a/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractHelperTest.cs
+++ b/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractHelperTest.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 
 #define CONTRACTS_FULL
 #define DEBUG
@@ -255,4 +254,3 @@ namespace MonoTests.System.Diagnostics.Contracts {
 
 }
 
-#endif

diff --git a/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractMarkerMethodsTest.cs b/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractMarkerMethodsTest.cs
index 6ca2d1ab03c231f2494f47919796d4bee756857d..dc130d8fcdf874e3093e46574073cc60440e9d9e 100644 (file)
--- a/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractMarkerMethodsTest.cs
+++ b/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractMarkerMethodsTest.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 
 #define CONTRACTS_FULL
 #define DEBUG
@@ -73,4 +72,3 @@ namespace MonoTests.System.Diagnostics.Contracts {
 
 }
 
-#endif

diff --git a/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractMustUseRewriterTest.cs b/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractMustUseRewriterTest.cs
index 2988b231b7e2b554e8cb8217c2122e4a322de653..4df40ce5a38a2b7a1df100dd2cb67bc7b70c2954 100755 (executable)
--- a/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractMustUseRewriterTest.cs
+++ b/mcs/class/corlib/Test/System.Diagnostics.Contracts/ContractMustUseRewriterTest.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 
 #define CONTRACTS_FULL
 #define DEBUG
@@ -123,4 +122,3 @@ namespace MonoTests.System.Diagnostics.Contracts {
 
 }
 
-#endif

diff --git a/mcs/class/corlib/Test/System.Diagnostics.Contracts/Helpers/RunAgainstReferenceAttribute.cs b/mcs/class/corlib/Test/System.Diagnostics.Contracts/Helpers/RunAgainstReferenceAttribute.cs
index 1f6854b2a031e38d951433636d8f26ac5dca32fd..d007b5c5f4a77b4d152d5658aa08369a8e2a9a0b 100644 (file)
--- a/mcs/class/corlib/Test/System.Diagnostics.Contracts/Helpers/RunAgainstReferenceAttribute.cs
+++ b/mcs/class/corlib/Test/System.Diagnostics.Contracts/Helpers/RunAgainstReferenceAttribute.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 
 using System;
 using System.Collections.Generic;
@@ -15,4 +14,3 @@ namespace MonoTests.System.Diagnostics.Contracts.Helpers {
 
 }
 
-#endif

diff --git a/mcs/class/corlib/Test/System.Diagnostics.Contracts/Helpers/TestContractBase.cs b/mcs/class/corlib/Test/System.Diagnostics.Contracts/Helpers/TestContractBase.cs
index 230b7ad412ba837e9a8e02dd7da2805dd5dd8d65..e2df4713ee4d3bf94113585fb17d3338ec24ca5f 100644 (file)
--- a/mcs/class/corlib/Test/System.Diagnostics.Contracts/Helpers/TestContractBase.cs
+++ b/mcs/class/corlib/Test/System.Diagnostics.Contracts/Helpers/TestContractBase.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 
 using System;
 using System.Collections.Generic;
@@ -41,4 +40,3 @@ namespace MonoTests.System.Diagnostics.Contracts.Helpers {
        }
 }
 
-#endif

diff --git a/mcs/class/corlib/Test/System.Diagnostics/StackFrameCas.cs b/mcs/class/corlib/Test/System.Diagnostics/StackFrameCas.cs
index 560977735bb0aa73fba7a1b6847defbd0f39d029..54b049f343e9ba94159ef0873ee04dde9229039e 100644 (file)
--- a/mcs/class/corlib/Test/System.Diagnostics/StackFrameCas.cs
+++ b/mcs/class/corlib/Test/System.Diagnostics/StackFrameCas.cs
@@ -74,7 +74,6 @@ namespace MonoCasTests.System.Diagnostics {
                        Check (sf, true);
                }
                
-#if !RUN_ONDOTNET || NET_4_0 // Disabled because .net 2 fails to load dll with "Failure decoding embedded permission set object" due to "/" path
                [Test]
                [FileIOPermission (SecurityAction.Deny, PathDiscovery = "/")]
                [ExpectedException (typeof (SecurityException))]
@@ -186,7 +185,6 @@ namespace MonoCasTests.System.Diagnostics {
                        StackFrame sf = new StackFrame ("mono.cs", 1, 1);
                        Check (sf, true);
                }               
-#endif         
 
                [Test]
                [PermissionSet (SecurityAction.Deny, Unrestricted = true)]

diff --git a/mcs/class/corlib/Test/System.Globalization/CultureInfoTest.cs b/mcs/class/corlib/Test/System.Globalization/CultureInfoTest.cs
index 760e5da656e25344459190d2954fe282dd088be4..32233f269db981b78c76b9dd72551f6667c63a71 100644 (file)
--- a/mcs/class/corlib/Test/System.Globalization/CultureInfoTest.cs
+++ b/mcs/class/corlib/Test/System.Globalization/CultureInfoTest.cs
@@ -179,11 +179,7 @@ namespace MonoTests.System.Globalization
                        try {
                                CultureInfo.CreateSpecificCulture ("uy32");
                                Assert.Fail ("#1");
-#if NET_4_0
                        } catch (CultureNotFoundException) {
-#else
-                       } catch (ArgumentException) {
-#endif
                        }
 
                        try {
@@ -200,11 +196,7 @@ namespace MonoTests.System.Globalization
                        CultureInfo ci = new CultureInfo ("nl");
                        try {
                                DateTimeFormatInfo dfi = ci.DateTimeFormat;
-#if NET_4_0
                                Assert.IsNotNull (dfi, "#1");
-#else
-                               Assert.Fail ("#1:" + (dfi != null));
-#endif
                        } catch (NotSupportedException ex) {
                                Assert.AreEqual (typeof (NotSupportedException), ex.GetType (), "#2");
                                Assert.IsNull (ex.InnerException, "#3");
@@ -235,9 +227,6 @@ namespace MonoTests.System.Globalization
                }
 
                [Test]
-#if !NET_4_0
-               [ExpectedException (typeof (NotSupportedException))]
-#endif
                public void TrySetNeutralCultureNotInvariant ()
                {
                        Thread.CurrentThread.CurrentCulture = new CultureInfo ("ar");
@@ -400,11 +389,7 @@ namespace MonoTests.System.Globalization
                        CultureInfo ci = new CultureInfo ("nl");
                        try {
                                NumberFormatInfo nfi = ci.NumberFormat;
-#if NET_4_0
                                Assert.IsNotNull (nfi, "#1");
-#else
-                               Assert.Fail ("#1:" + (nfi != null));
-#endif
                        } catch (NotSupportedException ex) {
                                Assert.AreEqual (typeof (NotSupportedException), ex.GetType (), "#2");
                                Assert.IsNull (ex.InnerException, "#3");
@@ -449,11 +434,7 @@ namespace MonoTests.System.Globalization
                                CultureInfo.GetCultureInfo (666);
                                Assert.Fail ("#1");
                        } catch (ArgumentException ex) {
-#if NET_4_0
                                Assert.AreEqual (typeof (CultureNotFoundException), ex.GetType (), "#2");
-#else
-                               Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
-#endif
                                Assert.IsNull (ex.InnerException, "#3");
                                Assert.IsNotNull (ex.Message, "#4");
                                Assert.IsNotNull (ex.ParamName, "#5");
@@ -483,11 +464,7 @@ namespace MonoTests.System.Globalization
                                CultureInfo.GetCultureInfo ("666");
                                Assert.Fail ("#1");
                        } catch (ArgumentException ex) {
-#if NET_4_0
                                Assert.AreEqual (typeof (CultureNotFoundException), ex.GetType (), "#2");
-#else
-                               Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
-#endif
                                Assert.IsNull (ex.InnerException, "#3");
                                Assert.IsNotNull (ex.Message, "#4");
                                Assert.IsNotNull (ex.ParamName, "#5");
@@ -612,11 +589,7 @@ namespace MonoTests.System.Globalization
                }
                
                [Test]
-#if NET_4_0
                [ExpectedException (typeof (CultureNotFoundException))]
-#else
-               [ExpectedException (typeof (ArgumentException))]
-#endif
                public void CultureNotFound ()
                {
                        // that's how the 'locale' gets defined for a device with an English UI

diff --git a/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileStreamTest.cs b/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileStreamTest.cs
index d0bbd5918d1c366a13953e4275032b43d345f665..3ec70c82c26faa1c54f5880b590887d24e4726ca 100644 (file)
--- a/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileStreamTest.cs
+++ b/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileStreamTest.cs
@@ -116,7 +116,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                        new IsolatedStorageFileStream ("/rootpath", FileMode.Create);
                }
 
-#if NET_4_0
                [Test]
                public void Constructor_StorageInvalid ()
                {
@@ -143,6 +142,5 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                        } catch (InvalidOperationException) {
                        }
                }
-#endif
        }
 }

diff --git a/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileTest.cs b/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileTest.cs
index 96208930b06da6842d29e7ed7889af13c5bdeb99..459974cdee4510253d0c38f84162660fd6ca688e 100644 (file)
--- a/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileTest.cs
+++ b/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileTest.cs
@@ -224,7 +224,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                }
 #endif
 
-#if NET_4_0
                // This is supposed to be working only in SL.
                [Test]
                [ExpectedException (typeof (NotSupportedException))]
@@ -232,7 +231,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                {
                        IsolatedStorageFile.GetUserStoreForSite ();
                }
-#endif
 
                [Test]
                public void GetStore_Domain_Zone ()
@@ -457,19 +455,10 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                                try {
                                        isf.CreateDirectory (path);
                                }
-#if NET_4_0
                                catch (IsolatedStorageException ex) {
                                        Assert.IsFalse (ex.Message.IndexOf (path) >= 0, "Message");
                                        Assert.IsNull (ex.InnerException, "InnerException");
                                }
-#else
-                               catch (IOException ex) {
-                                       Assert.AreEqual (typeof (IOException), ex.GetType (), "Type");
-                                       // don't leak path information
-                                       Assert.IsFalse (ex.Message.IndexOf (path) >= 0, "Message");
-                                       Assert.IsNull (ex.InnerException, "InnerException");
-                               }
-#endif
                        }
                }
 
@@ -498,11 +487,7 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                }
 
                [Test]
-#if NET_4_0
                [ExpectedException (typeof (ArgumentException))]
-#else
-               [ExpectedException (typeof (SecurityException))]
-#endif
                public void GetFilesInSubdirs ()
                {
                        IsolatedStorageFile isf = IsolatedStorageFile.GetUserStoreForAssembly ();
@@ -511,7 +496,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                }
 
         
-#if NET_4_0
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void GetDirsInSubDirs ()
@@ -520,7 +504,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                        isf.CreateDirectory ("subdir");
                        string [] dir_names = isf.GetDirectoryNames ("subdir/../*");
                }
-#endif
 
                [Test] // https://bugzilla.novell.com/show_bug.cgi?id=376188
                public void CreateSubDirectory ()
@@ -555,7 +538,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                        } catch (ArgumentNullException) {
                        }
 
-#if NET_4_0
                        // We are getting an internal IndexOutOfRangeException in 2.0
                        // Not sure we want to mimic that one.
                        try {
@@ -563,7 +545,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                                Assert.Fail ("#Exc1");
                        } catch (IsolatedStorageException) {
                        }
-#endif
 
                        try {
                                isf.DeleteFile ("idontexist");
@@ -571,13 +552,11 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                        } catch (IsolatedStorageException) {
                        }
 
-#if NET_4_0
                        try {
                                isf.DeleteFile ("../../file");
                                Assert.Fail ("#Exc3");
                        } catch (IsolatedStorageException) {
                        }
-#endif
                
                        try {
                                isf.DeleteFile ("subdir/file");
@@ -618,7 +597,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                        }
                }
 
-#if NET_4_0
                [Test]
                public void Remove ()
                {
@@ -1121,7 +1099,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                                isf.DeleteDirectory ("dir1");
                        }
                }
-#endif
                [Test]
                public void RootedDirectory ()
                {

diff --git a/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageTest.cs b/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageTest.cs
index 6bc4b9f502755309d6aa9251dce08b5671d8b254..a5a0a1cb7d1544f7600a76f882c153f1db609e40 100644 (file)
--- a/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageTest.cs
+++ b/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageTest.cs
@@ -245,7 +245,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                        }
                }
 
-#if NET_4_0
                [Test]
                [ExpectedException (typeof (InvalidOperationException))]
                public void IsolatedStorage_UsedSize ()
@@ -278,6 +277,5 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                        Assert.AreEqual (false, nais.IncreaseQuotaTo (0), "#A1");
                        Assert.AreEqual (false, nais.IncreaseQuotaTo (100), "#A2");
                }
-#endif
        }
 }

diff --git a/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs b/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs
index b18345e2dd267efbce7e8b142c6bd1246ef3a775..d6aacac5dc8ba3815d2c0c3e72b7200bf3249b69 100644 (file)
--- a/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs
+++ b/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs
@@ -1054,7 +1054,6 @@ namespace MonoTests.System.IO
                        Assert.AreEqual (TempFolder + DSC + "ToString.Test", info.ToString ());
                }
 
-#if NET_4_0
                [Test]
                public void EnumerateFileSystemInfosTest ()
                {
@@ -1069,7 +1068,6 @@ namespace MonoTests.System.IO
                        l.Sort ();
                        Assert.AreEqual ("1,2,a,b", string.Join (",", l), "#1");
                }
-#endif
 
 #if !MOBILE
                [Test]

diff --git a/mcs/class/corlib/Test/System.IO/DirectoryTest.cs b/mcs/class/corlib/Test/System.IO/DirectoryTest.cs
index 78e7a96f4782bea52aac333658c0d4d662383439..64ee5872b8396c1ca7942ceb31fb33174ce00b10 100644 (file)
--- a/mcs/class/corlib/Test/System.IO/DirectoryTest.cs
+++ b/mcs/class/corlib/Test/System.IO/DirectoryTest.cs
@@ -69,13 +69,11 @@ public class DirectoryTest
                Assert.AreEqual (afile, files0 [0], "#2");\r
                Assert.AreEqual (bfile, files0 [1], "#3");\r
 \r
-#if NET_4_0\r
                var files1 = new List<string> (Directory.EnumerateFiles (TempFolder, "*.src")).ToArray ();\r
                Array.Sort (files1);\r
                Assert.AreEqual (2, files1.Length, "#1.b");\r
                Assert.AreEqual (afile, files1 [0], "#2.b");\r
                Assert.AreEqual (bfile, files1 [1], "#3.b");\r
-#endif\r
 \r
                var files2 = Directory.GetFileSystemEntries (TempFolder, "*.src");\r
                Array.Sort (files2);\r
@@ -84,14 +82,12 @@ public class DirectoryTest
                Assert.AreEqual (bfile, files2 [1], "#3.c");\r
                Assert.AreEqual (cdir, files2 [2], "#4.c");\r
 \r
-#if NET_4_0\r
                var files3 = new List<string> (Directory.EnumerateFileSystemEntries (TempFolder, "*.src")).ToArray ();\r
                Array.Sort (files3);\r
                Assert.AreEqual (3, files3.Length, "#1.d");\r
                Assert.AreEqual (afile, files3 [0], "#2.d");\r
                Assert.AreEqual (bfile, files3 [1], "#3.d");\r
                Assert.AreEqual (cdir, files3 [2], "#4.d");\r
-#endif\r
        }\r
 #endif\r
        [Test]\r

diff --git a/mcs/class/corlib/Test/System.IO/PathTest.cs b/mcs/class/corlib/Test/System.IO/PathTest.cs
index 9f499819db06f206f3217e160ae5da620bcb31b5..897342eba7f20d6483be863287879c2b469029e1 100644 (file)
--- a/mcs/class/corlib/Test/System.IO/PathTest.cs
+++ b/mcs/class/corlib/Test/System.IO/PathTest.cs
@@ -201,9 +201,7 @@ namespace MonoTests.System.IO
                        expected = "one" + DSC + "two" + DSC;
                        Assert.AreEqual (expected, testPath, "Combine #07");
 
-#if NET_4_0
                        Assert.AreEqual ("a", Path.Combine (new [] { "a", "" }), "Combine #08");
-#endif
                }
 
                [Test]
@@ -1242,7 +1240,6 @@ namespace MonoTests.System.IO
                        }
                }
 
-#if NET_4_0
                string Concat (string sep, params string [] parms)
                {
                        return String.Join (sep, parms);
@@ -1382,7 +1379,6 @@ namespace MonoTests.System.IO
 
                        Assert.AreEqual ("", Path.Combine ("", "", "", "", ""), "#A4");
                }
-#endif
        }
 }
 

diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
index feb4201d8ebdb607db609afa5441c6de3e8dd269..0a06a7e4231420b0ba2c62fc047fa93ace9770f8 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
@@ -783,19 +783,8 @@ public class AssemblyBuilderTest
                try {
                        ab.Save ("lib.dll");
                        Assert.Fail ("#A1");
-#if NET_4_0
                } catch (CultureNotFoundException ex) {
                }
-#else
-               } catch (ArgumentException ex) {
-                       // Culture name doesnotexist is not supported
-                       Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2");
-                       Assert.IsNull (ex.InnerException, "#A3");
-                       Assert.IsNotNull (ex.Message, "#A4");
-                       Assert.IsTrue (ex.Message.IndexOf ("doesnotexist") != -1, "#A5");
-                       Assert.AreEqual ("name", ex.ParamName, "#A6");
-               }
-#endif
 
                ab = AppDomain.CurrentDomain.DefineDynamicAssembly (aname,
                        AssemblyBuilderAccess.RunAndSave, tempDir);
@@ -811,19 +800,8 @@ public class AssemblyBuilderTest
                try {
                        ab.Save ("lib.dll");
                        Assert.Fail ("#B1");
-#if NET_4_0
                } catch (CultureNotFoundException ex) {
                }
-#else
-               } catch (ArgumentException ex) {
-                       // Culture name neutral is not supported
-                       Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#B2");
-                       Assert.IsNull (ex.InnerException, "#B3");
-                       Assert.IsNotNull (ex.Message, "#B4");
-                       Assert.IsTrue (ex.Message.IndexOf ("neutral") != -1, "#B5");
-                       Assert.AreEqual ("name", ex.ParamName, "#B6");
-               }
-#endif
        }
 
        [Test] // DefineVersionInfoResource ()
@@ -905,19 +883,8 @@ public class AssemblyBuilderTest
                try {
                        ab.Save ("lib.dll");
                        Assert.Fail ("#A1");
-#if NET_4_0
                } catch (CultureNotFoundException ex) {
                }
-#else
-               } catch (ArgumentException ex) {
-                       // Culture name doesnotexist is not supported
-                       Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2");
-                       Assert.IsNull (ex.InnerException, "#A3");
-                       Assert.IsNotNull (ex.Message, "#A4");
-                       Assert.IsTrue (ex.Message.IndexOf ("doesnotexist") != -1, "#A5");
-                       Assert.AreEqual ("name", ex.ParamName, "#A6");
-               }
-#endif
 
                ab = AppDomain.CurrentDomain.DefineDynamicAssembly (aname,
                        AssemblyBuilderAccess.RunAndSave, tempDir);
@@ -933,19 +900,8 @@ public class AssemblyBuilderTest
                try {
                        ab.Save ("lib.dll");
                        Assert.Fail ("#B1");
-#if NET_4_0
                } catch (CultureNotFoundException ex) {
                }
-#else
-               } catch (ArgumentException ex) {
-                       // Culture name neutral is not supported
-                       Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#B2");
-                       Assert.IsNull (ex.InnerException, "#B3");
-                       Assert.IsNotNull (ex.Message, "#B4");
-                       Assert.IsTrue (ex.Message.IndexOf ("neutral") != -1, "#B5");
-                       Assert.AreEqual ("name", ex.ParamName, "#B6");
-               }
-#endif
        }
 
        [Test] // DefineVersionInfoResource (String, String, String, String, String)
@@ -1429,10 +1385,8 @@ public class AssemblyBuilderTest
                        string FxVersion;
 #if MOBILE
                        FxVersion = "2.0.5.0;";
-#elif NET_4_0
-                       FxVersion = "4.0.0.0;";
 #else
-                       FxVersion = "2.0.0.0;";
+                       FxVersion = "4.0.0.0;";
 #endif
                        Assert.AreEqual (new Version (FxVersion), refs [0].Version, "#D2:Version");
                        Assert.AreEqual (AssemblyVersionCompatibility.SameMachine,

diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/DerivedTypesTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/DerivedTypesTest.cs
index b9b6fbacca1651a6873b072f6938ea743dcb86ed..fa37466a77ad7083c62be10b91be468b6d5b5bd9 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection.Emit/DerivedTypesTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/DerivedTypesTest.cs
@@ -523,14 +523,7 @@ namespace MonoTests.System.Reflection.Emit
                        Assert.IsFalse (ptr.IsGenericType, "#9");
                        Assert.IsFalse (ptr.IsGenericTypeDefinition, "#10");
 
-#if NET_4_0
                        Assert.AreEqual (TypeAttributes.Public, ptr.Attributes, "#11");
-#else
-                       try {
-                               var x = ptr.Attributes; //This is because GenericTypeParameterBuilder doesn't support Attributes 
-                               Assert.Fail ("#11");
-                       } catch (NotSupportedException) {}
-#endif
 
                        Assert.IsTrue (ptr.HasElementType, "#12");
                        Assert.IsTrue (ptr.IsPointer, "#13");
@@ -1034,14 +1027,7 @@ namespace MonoTests.System.Reflection.Emit
                        Assert.IsFalse (byref.IsGenericTypeDefinition, "#10");
 
 
-#if NET_4_0
                        Assert.AreEqual (TypeAttributes.Public, byref.Attributes, "#11");
-#else
-                       try {
-                               var x = byref.Attributes; //This is because GenericTypeParameterBuilder doesn't support Attributes 
-                               Assert.Fail ("#11");
-                       } catch (NotSupportedException) {}
-#endif
 
                        Assert.IsTrue (byref.HasElementType, "#12");
                        Assert.IsTrue (byref.IsByRef, "#13");
@@ -1663,14 +1649,7 @@ namespace MonoTests.System.Reflection.Emit
                        Assert.IsFalse (arr.IsGenericType, "#9");
                        Assert.IsFalse (arr.IsGenericTypeDefinition, "#10");
 
-#if NET_4_0
                        Assert.AreEqual (TypeAttributes.Public, arr.Attributes, "#11");
-#else
-                       try {
-                               var x = arr.Attributes; //This is because GenericTypeParameterBuilder doesn't support Attributes 
-                               Assert.Fail ("#11");
-                       } catch (NotSupportedException) {}
-#endif
 
                        Assert.IsTrue (arr.HasElementType, "#12");
                        Assert.IsTrue (arr.IsArray, "#13");

diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/EnumBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/EnumBuilderTest.cs
index 90dee03802fb7f776eacc42b73235c5d956d7591..128e68bd15d3f64edf023441ddc5812e143ce672 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection.Emit/EnumBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/EnumBuilderTest.cs
@@ -199,7 +199,6 @@ namespace MonoTests.System.Reflection.Emit
                                _fieldName);
                }
 
-#if NET_4_0
                [Test]
                public void GetEnumUnderlyingType ()
                {
@@ -207,7 +206,6 @@ namespace MonoTests.System.Reflection.Emit
 
                        Assert.AreEqual (_enumType, @enum.GetEnumUnderlyingType ());
                }
-#endif
 
                [Test]
                public void TestFindMembersComplete ()

diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/GenericTypeParameterBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/GenericTypeParameterBuilderTest.cs
index 7f9db3b99fd0e53290e51e533cda40e407d2e53d..815c34c5cba9ec72421d19720eee89a0881da33c 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection.Emit/GenericTypeParameterBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/GenericTypeParameterBuilderTest.cs
@@ -77,14 +77,7 @@ namespace MonoTests.System.Reflection.Emit
                                Assert.Fail ("#11");
                        } catch (NotSupportedException) {}
 
-#if NET_4_0
                        Assert.AreEqual (TypeAttributes.Public, gparam.Attributes, "#12");
-#else
-                       try {
-                                       var x = gparam.Attributes;
-                                       Assert.Fail ("#12");
-                       } catch (NotSupportedException) {}
-#endif
                        Assert.IsFalse (gparam.HasElementType, "#13");
                        Assert.IsFalse (gparam.IsArray, "#14");
                        Assert.IsFalse (gparam.IsByRef, "#15");
@@ -349,9 +342,6 @@ namespace MonoTests.System.Reflection.Emit
                        Assert.IsFalse (gparam.IsGenericTypeDefinition, "#10");
                }
 
-#if !NET_4_0
-               [Category ("NotDotNet")]
-#endif
                [Test]
                // CompilerContext no longer supported
                [Category ("NotWorking")]

diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyNameTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyNameTest.cs
index 318f0c662b91669cdaaa0c807a762bbfb0c3ba5a..576b7380707efa5f84e1d5a0cbf06495c71822c7 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/AssemblyNameTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/AssemblyNameTest.cs
@@ -385,10 +385,8 @@ public class AssemblyNameTest {
                string AssemblyCorlib;
 #if MOBILE
                AssemblyCorlib = "mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e";
-#elif NET_4_0
-               AssemblyCorlib = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
 #else
-               AssemblyCorlib = "mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
+               AssemblyCorlib = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
 #endif
                Assert.AreEqual (AssemblyCorlib, an.FullName, "#2");
        }
@@ -1294,19 +1292,8 @@ public class AssemblyNameTest {
                try {
                        new AssemblyName (assemblyName + ", Culture=aa-AA");
                        Assert.Fail ("#1");
-#if NET_4_0
                } catch (CultureNotFoundException ex) {
                }
-#else
-               } catch (ArgumentException ex) {
-                       // Culture name 'aa-aa' is not supported
-                       Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
-                       Assert.IsNull (ex.InnerException, "#3");
-                       Assert.IsNotNull (ex.Message, "#4");
-                       Assert.IsNotNull (ex.ParamName, "#5");
-                       Assert.AreEqual ("name", ex.ParamName, "#6");
-               }
-#endif
        }
 
        [Test] // ctor (String)

diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
index 21f8526007254417951e7ae5aea28504f041eee6..fe18b8ee8db18209e2873aec02212b3bcb1c8f1d 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
@@ -1114,11 +1114,7 @@ namespace MonoTests.System.Reflection
                        Module module = assembly.ManifestModule;
                        Assert.IsNotNull (module, "#1");
 
-#if NET_4_0
                        Assert.AreEqual ("MonoModule", module.GetType ().Name, "#2");
-#else
-                       Assert.AreEqual (typeof (Module), module.GetType (), "#2");
-#endif
 
 #if !MONOTOUCH
                        Assert.AreEqual ("mscorlib.dll", module.Name, "#3");

diff --git a/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs b/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
index 0f2bc3eeaf481f0cc364e0d066c5a965e36f37b3..33c6fea356002d36fd7aa17208f76213e7aa3fed 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
@@ -729,7 +729,6 @@ namespace MonoTests.System.Reflection
                        {
                        }
                }
-#if NET_4_0
                interface IMethodInvoke<out T>
                {
                    T Test ();
@@ -753,7 +752,6 @@ namespace MonoTests.System.Reflection
                        Assert.AreEqual ("MethodInvoke", m0.Invoke (obj, new Object [0]));
                        Assert.AreEqual ("MethodInvoke", m1.Invoke (obj, new Object [0]));
                }
-#endif
 
 
                public int? Bug12856 ()

diff --git a/mcs/class/corlib/Test/System.Reflection/MonoGenericClassTest.cs b/mcs/class/corlib/Test/System.Reflection/MonoGenericClassTest.cs
index bb124cf2a2084df0f1a82bbd72d3a903a9998bd3..74624d1ba14c39cf6e4d52fb62f5a556bd7a54c6 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/MonoGenericClassTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/MonoGenericClassTest.cs
@@ -68,17 +68,14 @@ namespace MonoTests.System.Reflection.Emit
 
                        Assert.AreEqual ("type", inst.Name, "#1");
                        Assert.AreEqual ("foo", inst.Namespace, "#2");
-#if NET_4_0 && !MOBILE
+#if !MOBILE
                        Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]", inst.FullName, "#3");
                        Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], MonoTests.System.Reflection.Emit.MonoGenericClassTest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", inst.AssemblyQualifiedName, "#4");
 #elif NET_2_1 || MOBILE
                        Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]", inst.FullName, "#3");
                        Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]], MonoTests.System.Reflection.Emit.MonoGenericClassTest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", inst.AssemblyQualifiedName, "#4");
-#else
-                       Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]", inst.FullName, "#3");
-                       Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], MonoTests.System.Reflection.Emit.MonoGenericClassTest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", inst.AssemblyQualifiedName, "#4");
-#endif
                        Assert.AreEqual ("foo.type[System.Double,System.String]", inst.ToString (), "#5");
+#endif
                }
 
                static void CheckInst (string prefix, Type inst, int a, int b)
@@ -207,4 +204,4 @@ namespace MonoTests.System.Reflection.Emit
        }
 }
 
-#endif
\ No newline at end of file
+#endif

diff --git a/mcs/class/corlib/Test/System.Reflection/ParameterInfoTest.cs b/mcs/class/corlib/Test/System.Reflection/ParameterInfoTest.cs
index c01c5e6da216b40e9a632fe9b2e296ab4626a932..8d5fc3a921211c34cea0968954eb6806540a495c 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/ParameterInfoTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/ParameterInfoTest.cs
@@ -243,7 +243,6 @@ namespace MonoTests.System.Reflection
                {
                }
 
-#if NET_4_0
                public static void TestC (decimal u = decimal.MaxValue) {
                }
 
@@ -451,6 +450,5 @@ namespace MonoTests.System.Reflection
                        Assert.AreEqual (p2.myList, p2.CustomAttributes, "#3");
 #endif
                }
-#endif
        }
 }

diff --git a/mcs/class/corlib/Test/System.Resources/ResourceWriterTest.cs b/mcs/class/corlib/Test/System.Resources/ResourceWriterTest.cs
index b9ba73f113a9bbd253ddeff0d256cd9da6801e23..3ba64bcf1e1ce214062f1e9079205310bd34ab72 100644 (file)
--- a/mcs/class/corlib/Test/System.Resources/ResourceWriterTest.cs
+++ b/mcs/class/corlib/Test/System.Resources/ResourceWriterTest.cs
@@ -344,7 +344,6 @@ namespace MonoTests.System.Resources
                        writer.Close ();
                }
 
-#if NET_4_0
                // We are using a FileStream instead of a MemoryStream
                // to test that we support all kind of Stream instances,
                // and not only MemoryStream, as it used to be before 4.0.
@@ -581,7 +580,6 @@ namespace MonoTests.System.Resources
                                throw new NotSupportedException ();
                        }
                }
-#endif
 
                [Test]
                [Category ("MobileNotWorking")]

diff --git a/mcs/class/corlib/Test/System.Runtime.CompilerServices/ConditionalWeakTableTest.cs b/mcs/class/corlib/Test/System.Runtime.CompilerServices/ConditionalWeakTableTest.cs
index f6f4dabe2bad2eeee6dce0eeb2164a51b6645304..d4dcbcef6ec3a15b59370d05b2747cd6c868a993 100644 (file)
--- a/mcs/class/corlib/Test/System.Runtime.CompilerServices/ConditionalWeakTableTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.CompilerServices/ConditionalWeakTableTest.cs
@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using NUnit.Framework;
 using System;
@@ -496,4 +495,3 @@ namespace MonoTests.System.Runtime.CompilerServices {
        }
 }
 
-#endif

diff --git a/mcs/class/corlib/Test/System.Runtime.Remoting.Messaging/CallContextTest.cs b/mcs/class/corlib/Test/System.Runtime.Remoting.Messaging/CallContextTest.cs
index 9bae6c6ae1feb00137dd4a1228b1d4bb81308092..acd1b755a3a86ca01c21df96e1643ce58e3e2202 100644 (file)
--- a/mcs/class/corlib/Test/System.Runtime.Remoting.Messaging/CallContextTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.Remoting.Messaging/CallContextTest.cs
@@ -34,9 +34,7 @@ using System.Collections.Generic;
 using NUnit.Framework;
 using System.Runtime.Remoting.Messaging;
 using System.Threading;
-#if NET_4_0
 using System.Threading.Tasks;
-#endif
 
 namespace MonoTests.System.Runtime.Remoting.Messaging
 {
@@ -123,7 +121,6 @@ namespace MonoTests.System.Runtime.Remoting.Messaging
                        CallContext.FreeNamedDataSlot (SlotName);
                }
 
-#if NET_4_0
                [Test]
                public void CallContextPropagation_Task ()
                {
@@ -168,7 +165,6 @@ namespace MonoTests.System.Runtime.Remoting.Messaging
                        CallContext.FreeNamedDataSlot ("d1");
                        CallContext.FreeNamedDataSlot ("d2");
                }
-#endif
 
                [Test]
                public void FreeNamedDataSlot_ShouldClearLogicalData ()

diff --git a/mcs/class/corlib/Test/System.Runtime.Serialization.Formatters.Binary/BinaryFormatterTest.cs b/mcs/class/corlib/Test/System.Runtime.Serialization.Formatters.Binary/BinaryFormatterTest.cs
index 6d4b997fb45317b67a5c928e23f97d46332aa4e8..46297ab28f48bedf58088168382405e8fb1f7dda 100644 (file)
--- a/mcs/class/corlib/Test/System.Runtime.Serialization.Formatters.Binary/BinaryFormatterTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.Serialization.Formatters.Binary/BinaryFormatterTest.cs
@@ -508,7 +508,6 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Binary
                        Assert.AreEqual (a.Value, b.Value, "#3");
                }
 
-#if NET_4_0
                [Test]
                public void SerializationBindToName ()
                {
@@ -721,6 +720,5 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Binary
                                Assert.AreEqual (original.Other.GetType (), ((BaseClass)deserialized).Other.GetType ());
                        }
                }
-#endif
        }
 }

diff --git a/mcs/class/corlib/Test/System.Runtime.Serialization/SerializationBinderTest.cs b/mcs/class/corlib/Test/System.Runtime.Serialization/SerializationBinderTest.cs
index 44c441b2f637ff335dd2ffc2b16bfb2abd975a5b..d39d7ae194cf183af8ac1184f15b91e3a4060b1d 100644 (file)
--- a/mcs/class/corlib/Test/System.Runtime.Serialization/SerializationBinderTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.Serialization/SerializationBinderTest.cs
@@ -34,7 +34,6 @@ namespace MonoTests.System.Runtime.Serialization
        [TestFixture]
        public class SerializationBinderTest
        {
-#if NET_4_0
                [Test]
                public void BindToName ()
                {
@@ -46,7 +45,6 @@ namespace MonoTests.System.Runtime.Serialization
                        Assert.AreEqual (null, assembly_name, "#A0");
                        Assert.AreEqual (null, type_name, "#A1");
                }
-#endif
        }
 
        class TestSerializationBinder : SerializationBinder

diff --git a/mcs/class/corlib/Test/System.Runtime.Serialization/SerializationInfoTest.cs b/mcs/class/corlib/Test/System.Runtime.Serialization/SerializationInfoTest.cs
index b9196c26bfca8e44050ab1f97b6d581a1b23dc56..39c76df28329a4f783fd093b5ce440b85666618b 100644 (file)
--- a/mcs/class/corlib/Test/System.Runtime.Serialization/SerializationInfoTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.Serialization/SerializationInfoTest.cs
@@ -44,7 +44,6 @@ namespace MonoTests.System.Runtime.Serialization
                        sinfo.SetType (point_type);
                        Assert.AreEqual (point_type.FullName, sinfo.FullTypeName, "#A0");
                        Assert.AreEqual (point_type.Assembly.FullName, sinfo.AssemblyName, "#A1");
-#if NET_4_0
                        Assert.AreEqual (point_type, sinfo.ObjectType, "#A2");
                        Assert.AreEqual (false, sinfo.IsAssemblyNameSetExplicit, "#A3");
                        Assert.AreEqual (false, sinfo.IsFullTypeNameSetExplicit, "#A4");
@@ -59,10 +58,8 @@ namespace MonoTests.System.Runtime.Serialization
                        Assert.AreEqual (datetime_type, sinfo.ObjectType, "#B2");
                        Assert.AreEqual (false, sinfo.IsAssemblyNameSetExplicit, "#B3");
                        Assert.AreEqual (false, sinfo.IsFullTypeNameSetExplicit, "#B4");
-#endif
                }
 
-#if NET_4_0
                [Test]
                public void ObjectType ()
                {
@@ -101,7 +98,6 @@ namespace MonoTests.System.Runtime.Serialization
                        Assert.AreEqual (true, sinfo.IsFullTypeNameSetExplicit, "#C0");
                        Assert.AreEqual (original_name, sinfo.FullTypeName, "#C1");
                }
-#endif
        }
 }
 

diff --git a/mcs/class/corlib/Test/System.Runtime.Versioning/TargetFrameworkAttributeTest.cs b/mcs/class/corlib/Test/System.Runtime.Versioning/TargetFrameworkAttributeTest.cs
index 487f98191cff4f07149afe97efc3827f4cb4ad7b..529ce2205b92c3e1cbcc7533f29f5f018b3a10c7 100644 (file)
--- a/mcs/class/corlib/Test/System.Runtime.Versioning/TargetFrameworkAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.Versioning/TargetFrameworkAttributeTest.cs
@@ -31,7 +31,6 @@ using System.Text;
 
 using NUnit.Framework;
 
-#if NET_4_0
 namespace MonoTests.System.Runtime.Versioning
 {
        [TestFixture]
@@ -92,4 +91,3 @@ namespace MonoTests.System.Runtime.Versioning
                }
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/corlib/Test/System.Security.AccessControl/ObjectSecurity_TTest.cs b/mcs/class/corlib/Test/System.Security.AccessControl/ObjectSecurity_TTest.cs
index 74c05478daedd029e3e9437dbda8383c0a5cd873..305b5737f93b76da6b71e500d25301fdc0e1cc82 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.AccessControl/ObjectSecurity_TTest.cs
+++ b/mcs/class/corlib/Test/System.Security.AccessControl/ObjectSecurity_TTest.cs
@@ -3,7 +3,6 @@
 // Authors:
 //     James Bellinger (jfb@zer7.com)
 
-#if NET_4_0
 
 using System;
 using System.Security.AccessControl;
@@ -101,5 +100,4 @@ namespace MonoTests.System.Security.AccessControl
        }
 }
 
-#endif
 

diff --git a/mcs/class/corlib/Test/System.Security.Policy/EvidenceTest.cs b/mcs/class/corlib/Test/System.Security.Policy/EvidenceTest.cs
index f0b12b55af26c9d34b119708f27503f30f908e5c..648c5fc34a153d74423d7a4420cdf9919123c3c8 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Policy/EvidenceTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Policy/EvidenceTest.cs
@@ -297,23 +297,6 @@ namespace MonoTests.System.Security.Policy {
                        Assert.IsNotNull (e.SyncRoot, "SyncRoot");
                }
 
-#if !NET_4_0
-               [Test]
-               public void Equals_GetHashCode () 
-               {
-                       Evidence e1 = new Evidence ();
-                       Evidence e2 = new Evidence ();
-                       Assert.AreEqual (e1.GetHashCode (), e2.GetHashCode (), "GetHashCode-1");
-                       Assert.IsTrue (e1.Equals (e2), "e1.Equals(e2)");
-                       e1.AddAssembly (String.Empty);
-                       e2.AddAssembly (String.Empty);
-                       Assert.AreEqual (e1.GetHashCode (), e2.GetHashCode (), "GetHashCode-2");
-                       e1.AddHost (String.Empty);
-                       e2.AddHost (String.Empty);
-                       Assert.AreEqual (e1.GetHashCode (), e2.GetHashCode (), "GetHashCode-3");
-                       Assert.IsTrue (e2.Equals (e1), "e2.Equals(e1)");
-               }
-#endif
 
                [Test]
                public void Clear () 

diff --git a/mcs/class/corlib/Test/System.Text/StringBuilderTest.cs b/mcs/class/corlib/Test/System.Text/StringBuilderTest.cs
index ce3ec40abc03b898346fa53435017c9f6c913515..f5b6a4e1ff6680ec693727977c6ac977fc93bbb4 100644 (file)
--- a/mcs/class/corlib/Test/System.Text/StringBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Text/StringBuilderTest.cs
@@ -531,7 +531,6 @@ namespace MonoTests.System.Text {
        }
 
 
-#if NET_4_0
        [Test]
        public void ClearMethod () {
                StringBuilder sb = new StringBuilder ("Text");
@@ -539,7 +538,6 @@ namespace MonoTests.System.Text {
                Assert.AreEqual (0, sb.Length, "#1");
                Assert.AreEqual (String.Empty, sb.ToString (), "#2");
        }
-#endif
 
 }
 

diff --git a/mcs/class/corlib/Test/System.Threading.Tasks/ParallelTestHelper.cs b/mcs/class/corlib/Test/System.Threading.Tasks/ParallelTestHelper.cs
index 976701aa3cdbe684d64b1cf5e4879161af1251fd..f65ca25649dba56b5af81cae8a4fae3d80a590e7 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading.Tasks/ParallelTestHelper.cs
+++ b/mcs/class/corlib/Test/System.Threading.Tasks/ParallelTestHelper.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // TestHelper.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -90,4 +89,3 @@ namespace MonoTests.System.Threading.Tasks
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading.Tasks/ParallelTests.cs b/mcs/class/corlib/Test/System.Threading.Tasks/ParallelTests.cs
index 4f381c1c9e864e0abfc6590697aebdf3b9a93326..3d8ead709af579605df739545158e65b2a238923 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading.Tasks/ParallelTests.cs
+++ b/mcs/class/corlib/Test/System.Threading.Tasks/ParallelTests.cs
@@ -23,7 +23,6 @@
 //
 //
 
-#if NET_4_0
 
 using System;
 using System.Linq;
@@ -224,4 +223,3 @@ namespace MonoTests.System.Threading.Tasks
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading.Tasks/TaskCompletionSourceTests.cs b/mcs/class/corlib/Test/System.Threading.Tasks/TaskCompletionSourceTests.cs
index 30c931e067c2949b2477588f8b3526f660d66224..903a6946a08163a08687381b77d54f21000ed0d7 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading.Tasks/TaskCompletionSourceTests.cs
+++ b/mcs/class/corlib/Test/System.Threading.Tasks/TaskCompletionSourceTests.cs
@@ -24,7 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -239,4 +238,3 @@ namespace MonoTests.System.Threading.Tasks
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest.cs b/mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest.cs
index d3241be3857225ed94ea26529291c9243e866732..94d36a131e5ab550770551e7dc0f2d2cffd3163b 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest.cs
+++ b/mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest.cs
@@ -28,7 +28,6 @@
 //
 //
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -626,4 +625,3 @@ namespace MonoTests.System.Threading.Tasks
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest_T.cs b/mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest_T.cs
index bfa5a50449c62be275dfbc428d70e76a80f08b55..0ca7f49f474c9c6fb8407df5eb41a663090a62c3 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest_T.cs
+++ b/mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest_T.cs
@@ -26,7 +26,6 @@
 //
 //
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -277,4 +276,3 @@ namespace MonoTests.System.Threading.Tasks
        }
 }
 
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading.Tasks/TaskSchedulerTest.cs b/mcs/class/corlib/Test/System.Threading.Tasks/TaskSchedulerTest.cs
index da0327f7c4713cd22916bf5db01a6792c820311a..e8130bc06fd5cf8bac6fc0e3dd06b7d81e841f9e 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading.Tasks/TaskSchedulerTest.cs
+++ b/mcs/class/corlib/Test/System.Threading.Tasks/TaskSchedulerTest.cs
@@ -22,7 +22,6 @@
 //
 //
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -256,4 +255,3 @@ namespace MonoTests.System.Threading.Tasks
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs b/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs
index 957e55a36c7ab346f53bc326e5005f026e278895..e0b127a0bc708543bfa39f3f3f6d7aa59c6e93ac 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs
+++ b/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs
@@ -27,7 +27,6 @@
 //
 //
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -2118,4 +2117,3 @@ namespace MonoTests.System.Threading.Tasks
 #endif
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading.Tasks/Task_T_Test.cs b/mcs/class/corlib/Test/System.Threading.Tasks/Task_T_Test.cs
index d6bc2e774d933f7095626b68d5adf58be308b9c9..4c5428f828ef641735107cebe9500ad1461a2690 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading.Tasks/Task_T_Test.cs
+++ b/mcs/class/corlib/Test/System.Threading.Tasks/Task_T_Test.cs
@@ -22,7 +22,6 @@
 //
 //
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -118,4 +117,3 @@ namespace MonoTests.System.Threading.Tasks
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading/CancellationTokenSourceTest.cs b/mcs/class/corlib/Test/System.Threading/CancellationTokenSourceTest.cs
index 5bf805aae0b6e0264998d15c63b8d01f5768c77a..bcde74394a9fa374b6b619edbd834d29e208e17b 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading/CancellationTokenSourceTest.cs
+++ b/mcs/class/corlib/Test/System.Threading/CancellationTokenSourceTest.cs
@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -490,5 +489,4 @@ namespace MonoTests.System.Threading
        }
 }
 
-#endif
 

diff --git a/mcs/class/corlib/Test/System.Threading/CancellationTokenTests.cs b/mcs/class/corlib/Test/System.Threading/CancellationTokenTests.cs
index cb6c129e3dae99e19e5ac10d60e0c26d52b1b49a..3adc7a2bc6ff4ed72130932d40528b13f2f562d2 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading/CancellationTokenTests.cs
+++ b/mcs/class/corlib/Test/System.Threading/CancellationTokenTests.cs
@@ -26,7 +26,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -105,4 +104,3 @@ namespace MonoTests.System.Threading
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading/CountdownEventTests.cs b/mcs/class/corlib/Test/System.Threading/CountdownEventTests.cs
index 1f5ba0e03e557e10fd0df5651c82fb70d87ae0a5..b9d20c73abf2df6f911f288e24c7a9a5b5ca52ca 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading/CountdownEventTests.cs
+++ b/mcs/class/corlib/Test/System.Threading/CountdownEventTests.cs
@@ -26,7 +26,6 @@
 //
 //
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -396,4 +395,3 @@ namespace MonoTests.System.Threading
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading/LazyInitializerTest.cs b/mcs/class/corlib/Test/System.Threading/LazyInitializerTest.cs
index 2b4ec92e074d653e9e78d842b0e30a387d3764d3..0c0ed7da829fd2c719ab08d71b98889829bce1ff 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading/LazyInitializerTest.cs
+++ b/mcs/class/corlib/Test/System.Threading/LazyInitializerTest.cs
@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -92,5 +91,4 @@ namespace MonoTests.System.Threading
        }
 }
 
-#endif
 

diff --git a/mcs/class/corlib/Test/System.Threading/ManualResetEventSlimTests.cs b/mcs/class/corlib/Test/System.Threading/ManualResetEventSlimTests.cs
index a0389f27a03881d86abb4976b61dc8091b948e9f..b1cb401ef47027c2614bf4205d7e78c2a43aa02b 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading/ManualResetEventSlimTests.cs
+++ b/mcs/class/corlib/Test/System.Threading/ManualResetEventSlimTests.cs
@@ -27,7 +27,6 @@
 //
 //
 
-#if NET_4_0
 
 using System;
 using System.Threading;
@@ -306,4 +305,3 @@ namespace MonoTests.System.Threading
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading/MonitorTest.cs b/mcs/class/corlib/Test/System.Threading/MonitorTest.cs
index 2198316ab0548b960d02813eb446fb9b140c7e6f..1c4ae9408a0e936dcb9053181c91ca59f4ac5a29 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading/MonitorTest.cs
+++ b/mcs/class/corlib/Test/System.Threading/MonitorTest.cs
@@ -303,7 +303,6 @@ namespace MonoTests.System.Threading {
                                Assert.IsFalse (Monitor.Wait (o, SmallNegative), "Wait");
                        }
                }
-#if NET_4_0
                [Test]
                public void Enter_bool ()
                {
@@ -333,7 +332,6 @@ namespace MonoTests.System.Threading {
                        Monitor.Enter (o, ref taken);
                }
 
-#endif
 
        }
 }

diff --git a/mcs/class/corlib/Test/System.Threading/SemaphoreSlimTests.cs b/mcs/class/corlib/Test/System.Threading/SemaphoreSlimTests.cs
index 80eb3ce263faaba06fc0a6245ef3fd7ee9f0970d..eb07f467fd0489663d3932041fa9397bfa759a50 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading/SemaphoreSlimTests.cs
+++ b/mcs/class/corlib/Test/System.Threading/SemaphoreSlimTests.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // SemaphoreSlimTests.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -92,4 +91,3 @@ namespace MonoTests.System.Threading
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading/SpinLockTests.cs b/mcs/class/corlib/Test/System.Threading/SpinLockTests.cs
index 03fb7aaa3a16f7a44e0c8e831bd5dea616cead29..80865e5eb06703d64b16c251997ede8171127901 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading/SpinLockTests.cs
+++ b/mcs/class/corlib/Test/System.Threading/SpinLockTests.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 //
 // SpinLockTests.cs
 //
@@ -156,4 +155,3 @@ namespace MonoTests.System.Threading
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading/ThreadLocalTests.cs b/mcs/class/corlib/Test/System.Threading/ThreadLocalTests.cs
index d892c5719176c332d1f8e9d05ba2a411924f0d40..aefa9ab41083fb036fef9d981c7007ec5993f1eb 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading/ThreadLocalTests.cs
+++ b/mcs/class/corlib/Test/System.Threading/ThreadLocalTests.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // ThreadLazyTests.cs
 //  
@@ -215,4 +214,3 @@ namespace MonoTests.System.Threading
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System.Threading/ThreadPoolTest.cs b/mcs/class/corlib/Test/System.Threading/ThreadPoolTest.cs
index 3f1d2950424d695d25f65e545650caabf698e08a..888b90c9b411eaf19fe7acd0492c09553940fbed 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading/ThreadPoolTest.cs
+++ b/mcs/class/corlib/Test/System.Threading/ThreadPoolTest.cs
@@ -79,7 +79,6 @@ namespace MonoTests.System.Threading
                        Assert.IsTrue (sum   == 0, "#2");
                }
 
-#if NET_4_0
                event WaitCallback e;
 
                [Test]
@@ -98,6 +97,5 @@ namespace MonoTests.System.Threading
                        ThreadPool.UnsafeQueueUserWorkItem (e, null);
                        Assert.IsTrue (ev.Wait (3000));
                }
-#endif
        }
 }
\ No newline at end of file

diff --git a/mcs/class/corlib/Test/System/AggregateExceptionTests.cs b/mcs/class/corlib/Test/System/AggregateExceptionTests.cs
index 07161cbffbd320337a26130323e30eed0205be79..80a97395b6c12840b54c462e891760fb7e332029 100644 (file)
--- a/mcs/class/corlib/Test/System/AggregateExceptionTests.cs
+++ b/mcs/class/corlib/Test/System/AggregateExceptionTests.cs
@@ -22,7 +22,6 @@
 //
 //
 
-#if NET_4_0
 
 using System;
 using System.Linq;
@@ -141,4 +140,3 @@ namespace MonoTests.System
                }
        }
 }
-#endif

diff --git a/mcs/class/corlib/Test/System/ArrayTest.cs b/mcs/class/corlib/Test/System/ArrayTest.cs
index a1cc1a008cbec9353c146b199a7d85475a671282..6902f43be1e989a386ccaf9144a8dd7d1c881aa9 100644 (file)
--- a/mcs/class/corlib/Test/System/ArrayTest.cs
+++ b/mcs/class/corlib/Test/System/ArrayTest.cs
@@ -3449,7 +3449,6 @@ public class ArrayTest
                Assert.AreEqual (input, expected);
        }
 
-#if NET_4_0
        [Test]
        [ExpectedException (typeof (ArgumentException))]
        public void CompareToWithJaggedArray () {
@@ -3616,7 +3615,6 @@ public class ArrayTest
                Assert.AreEqual (3, c.Counter);         
        }
 
-#endif
 
        [Test]
        public void JaggedArrayCtor ()

diff --git a/mcs/class/corlib/Test/System/CharCategoryTest.cs b/mcs/class/corlib/Test/System/CharCategoryTest.cs
index 108bd16953a447444a6a43496ddb1a25d3e04561..f81f7acd42075c509042b7a75970c95c3a581d44 100644 (file)
--- a/mcs/class/corlib/Test/System/CharCategoryTest.cs
+++ b/mcs/class/corlib/Test/System/CharCategoryTest.cs
@@ -108,7 +108,6 @@ namespace MonoTests.System
                        CompareWithDump (new ComparisonMethod (Char.IsWhiteSpace), whitespaceChars, true);
                }
 
-#if NET_4_0
                string controls = "0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 "
                + "13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 7f 80 81 82 83 84 "
                + "85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 "
@@ -318,680 +317,6 @@ namespace MonoTests.System
 
                string whitespaceChars = "9 a b c d 20 85 a0 1680 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 200a 2028 2029 202f 205f 3000 found 25 chars.";
 
-#elif !NET_4_0
-
-               string controls = "0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 "
-               + "13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 7f 80 81 82 83 84 "
-               + "85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 "
-               + "98 99 9a 9b 9c 9d 9e 9f found 65 chars.";
-
-               string digits = "30 31 32 33 34 35 36 37 38 39 660 661 662 "
-               + "663 664 665 666 667 668 669 6f0 6f1 6f2 6f3 6f4 6f5 6f6 "
-               + "6f7 6f8 6f9 7c0 7c1 7c2 7c3 7c4 7c5 7c6 7c7 7c8 7c9 966 "
-               + "967 968 969 96a 96b 96c 96d 96e 96f 9e6 9e7 9e8 9e9 9ea "
-               + "9eb 9ec 9ed 9ee 9ef a66 a67 a68 a69 a6a a6b a6c a6d a6e "
-               + "a6f ae6 ae7 ae8 ae9 aea aeb aec aed aee aef b66 b67 b68 "
-               + "b69 b6a b6b b6c b6d b6e b6f be6 be7 be8 be9 bea beb bec "
-               + "bed bee bef c66 c67 c68 c69 c6a c6b c6c c6d c6e c6f ce6 "
-               + "ce7 ce8 ce9 cea ceb cec ced cee cef d66 d67 d68 d69 d6a "
-               + "d6b d6c d6d d6e d6f e50 e51 e52 e53 e54 e55 e56 e57 e58 "
-               + "e59 ed0 ed1 ed2 ed3 ed4 ed5 ed6 ed7 ed8 ed9 f20 f21 f22 "
-               + "f23 f24 f25 f26 f27 f28 f29 1040 1041 1042 1043 1044 1045 "
-               + "1046 1047 1048 1049 17e0 17e1 17e2 17e3 17e4 17e5 17e6 "
-               + "17e7 17e8 17e9 1810 1811 1812 1813 1814 1815 1816 1817 "
-               + "1818 1819 1946 1947 1948 1949 194a 194b 194c 194d 194e "
-               + "194f 19d0 19d1 19d2 19d3 19d4 19d5 19d6 19d7 19d8 19d9 "
-               + "1b50 1b51 1b52 1b53 1b54 1b55 1b56 1b57 1b58 1b59 ff10 "
-               + "ff11 ff12 ff13 ff14 ff15 ff16 ff17 ff18 ff19 found 230 "
-               + "chars.";
-
-               string lowerChars = "80 e51 e52 e53 e54 e55 e56 e57 e58 e59 "
-               + "ed0 ed1 ed2 ed3 ed4 ed5 ed6 ed7 ed8 ed9 f20 f21 f22 f23 "
-               + "f24 f25 f26 f27 f28 f29 f2a f2b f2c f2d f2e f2f f30 f31 "
-               + "f32 f33 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 "
-               + "1369 136a 136b 136c 136d 136e 136f 1370 1371 1372 1373 "
-               + "1374 1375 1376 1377 1378 1379 137a 137b 137c 16ee 16ef "
-               + "16f0 17e0 17e1 17e2 17e3 17e4 17e5 17e6 17e7 17e8 17e9 "
-               + "17f0 17f1 17f2 17f3 17f4 17f5 17f6 17f7 17f8 17f9 1810 "
-               + "1811 1812 1813 1814 1815 1816 1817 1818 1819 1946 1947 "
-               + "1948 1949 194a 194b 194c 194d 194e 194f 19d0 19d1 19d2 "
-               + "19d3 19d4 19d5 19d6 19d7 19d8 19d9 1b50 1b51 1b52 1b53 "
-               + "1b54 1b55 1b56 1b57 1b58 1b59 2070 2074 2075 2076 2077 "
-               + "2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 "
-               + "2089 2153 2154 2155 2156 2157 2158 2159 215a 215b 215c "
-               + "215d 215e 215f 2160 2161 2162 2163 2164 2165 2166 2167 "
-               + "2168 2169 216a 216b 216c 216d 216e 216f 2170 2171 2172 "
-               + "2173 2174 2175 2176 2177 2178 2179 217a 217b 217c 217d "
-               + "217e 217f 2180 2181 2182 2460 2461 2462 2463 2464 2465 "
-               + "2466 2467 2468 2469 246a 246b 246c 246d 246e 246f 2470 "
-               + "2471 2472 2473 2474 2475 2476 2477 2478 2479 247a 247b "
-               + "247c 247d 247e 247f 2480 2481 2482 2483 2484 2485 2486 "
-               + "2487 2488 2489 248a 248b 248c 248d 248e 248f 2490 2491 "
-               + "2492 2493 2494 2495 2496 2497 2498 2499 249a 249b 24ea "
-               + "24eb 24ec 24ed 24ee 24ef 24f0 24f1 24f2 24f3 24f4 24f5 "
-               + "24f6 24f7 24f8 24f9 24fa 24fb 24fc 24fd 24fe 24ff 2776 "
-               + "2777 2778 2779 277a 277b 277c 277d 277e 277f 2780 2781 "
-               + "2782 2783 2784 2785 2786 2787 2788 2789 278a 278b 278c "
-               + "278d 278e 278f 2790 2791 2792 2793 2cfd 3007 3021 3022 "
-               + "3023 3024 3025 3026 3027 3028 3029 3038 3039 303a 3192 "
-               + "3193 3194 3195 3220 3221 3222 3223 3224 3225 3226 3227 "
-               + "3228 3229 3251 3252 3253 3254 3255 3256 3257 3258 3259 "
-               + "325a 325b 325c 325d 325e 325f 3280 3281 3282 3283 3284 "
-               + "3285 3286 3287 3288 3289 32b1 32b2 32b3 32b4 32b5 32b6 "
-               + "32b7 32b8 32b9 32ba 32bb 32bc 32bd 32be 32bf ff10 ff11 "
-               + "ff12 ff13 ff14 ff15 ff16 ff17 ff18 ff19 found 533 chars.";
-
-               string puncts = "21 22 23 25 26 27 28 29 2a 2c 2d 2e 2f 3a 3b "
-               + "3f 40 5b 5c 5d 5f 7b 7d a1 ab ad b7 bb bf 37e 387 55a 55b "
-               + "55c 55d 55e 55f 589 58a 5be 5c0 5c3 5c6 5f3 5f4 60c 60d "
-               + "61b 61e 61f 66a 66b 66c 66d 6d4 700 701 702 703 704 705 "
-               + "706 707 708 709 70a 70b 70c 70d 7f7 7f8 7f9 964 965 970 "
-               + "df4 e4f e5a e5b f04 f05 f06 f07 f08 f09 f0a f0b f0c f0d "
-               + "f0e f0f f10 f11 f12 f3a f3b f3c f3d f85 fd0 fd1 104a 104b "
-               + "104c 104d 104e 104f 10fb 1361 1362 1363 1364 1365 1366 "
-               + "1367 1368 166d 166e 169b 169c 16eb 16ec 16ed 1735 1736 "
-               + "17d4 17d5 17d6 17d8 17d9 17da 1800 1801 1802 1803 1804 "
-               + "1805 1806 1807 1808 1809 180a 1944 1945 19de 19df 1a1e "
-               + "1a1f 1b5a 1b5b 1b5c 1b5d 1b5e 1b5f 1b60 2010 2011 2012 "
-               + "2013 2014 2015 2016 2017 2018 2019 201a 201b 201c 201d "
-               + "201e 201f 2020 2021 2022 2023 2024 2025 2026 2027 2030 "
-               + "2031 2032 2033 2034 2035 2036 2037 2038 2039 203a 203b "
-               + "203c 203d 203e 203f 2040 2041 2042 2043 2045 2046 2047 "
-               + "2048 2049 204a 204b 204c 204d 204e 204f 2050 2051 2053 "
-               + "2054 2055 2056 2057 2058 2059 205a 205b 205c 205d 205e "
-               + "207d 207e 208d 208e 2329 232a 2768 2769 276a 276b 276c "
-               + "276d 276e 276f 2770 2771 2772 2773 2774 2775 27c5 27c6 "
-               + "27e6 27e7 27e8 27e9 27ea 27eb 2983 2984 2985 2986 2987 "
-               + "2988 2989 298a 298b 298c 298d 298e 298f 2990 2991 2992 "
-               + "2993 2994 2995 2996 2997 2998 29d8 29d9 29da 29db 29fc "
-               + "29fd 2cf9 2cfa 2cfb 2cfc 2cfe 2cff 2e00 2e01 2e02 2e03 "
-               + "2e04 2e05 2e06 2e07 2e08 2e09 2e0a 2e0b 2e0c 2e0d 2e0e "
-               + "2e0f 2e10 2e11 2e12 2e13 2e14 2e15 2e16 2e17 2e1c 2e1d "
-               + "3001 3002 3003 3008 3009 300a 300b 300c 300d 300e 300f "
-               + "3010 3011 3014 3015 3016 3017 3018 3019 301a 301b 301c "
-               + "301d 301e 301f 3030 303d 30a0 30fb a874 a875 a876 a877 "
-               + "fd3e fd3f fe10 fe11 fe12 fe13 fe14 fe15 fe16 fe17 fe18 "
-               + "fe19 fe30 fe31 fe32 fe33 fe34 fe35 fe36 fe37 fe38 fe39 "
-               + "fe3a fe3b fe3c fe3d fe3e fe3f fe40 fe41 fe42 fe43 fe44 "
-               + "fe45 fe46 fe47 fe48 fe49 fe4a fe4b fe4c fe4d fe4e fe4f "
-               + "fe50 fe51 fe52 fe54 fe55 fe56 fe57 fe58 fe59 fe5a fe5b "
-               + "fe5c fe5d fe5e fe5f fe60 fe61 fe63 fe68 fe6a fe6b ff01 "
-               + "ff02 ff03 ff05 ff06 ff07 ff08 ff09 ff0a ff0c ff0d ff0e "
-               + "ff0f ff1a ff1b ff1f ff20 ff3b ff3c ff3d ff3f ff5b ff5d "
-               + "ff5f ff60 ff61 ff62 ff63 ff64 ff65 found 440 chars.";
-
-               string separators = "20 a0 1680 180e 2000 2001 2002 2003 2004 "
-               + "2005 2006 2007 2008 2009 200a 2028 2029 202f 205f 3000 "
-               + "found 20 chars.";
-
-               string surrogateChars = "d800 d801 d802 d803 d804 d805 d806 "
-               + "d807 d808 d809 d80a d80b d80c d80d d80e d80f d810 d811 "
-               + "d812 d813 d814 d815 d816 d817 d818 d819 d81a d81b d81c "
-               + "d81d d81e d81f d820 d821 d822 d823 d824 d825 d826 d827 "
-               + "d828 d829 d82a d82b d82c d82d d82e d82f d830 d831 d832 "
-               + "d833 d834 d835 d836 d837 d838 d839 d83a d83b d83c d83d "
-               + "d83e d83f d840 d841 d842 d843 d844 d845 d846 d847 d848 "
-               + "d849 d84a d84b d84c d84d d84e d84f d850 d851 d852 d853 "
-               + "d854 d855 d856 d857 d858 d859 d85a d85b d85c d85d d85e "
-               + "d85f d860 d861 d862 d863 d864 d865 d866 d867 d868 d869 "
-               + "d86a d86b d86c d86d d86e d86f d870 d871 d872 d873 d874 "
-               + "d875 d876 d877 d878 d879 d87a d87b d87c d87d d87e d87f "
-               + "d880 d881 d882 d883 d884 d885 d886 d887 d888 d889 d88a "
-               + "d88b d88c d88d d88e d88f d890 d891 d892 d893 d894 d895 "
-               + "d896 d897 d898 d899 d89a d89b d89c d89d d89e d89f d8a0 "
-               + "d8a1 d8a2 d8a3 d8a4 d8a5 d8a6 d8a7 d8a8 d8a9 d8aa d8ab "
-               + "d8ac d8ad d8ae d8af d8b0 d8b1 d8b2 d8b3 d8b4 d8b5 d8b6 "
-               + "d8b7 d8b8 d8b9 d8ba d8bb d8bc d8bd d8be d8bf d8c0 d8c1 "
-               + "d8c2 d8c3 d8c4 d8c5 d8c6 d8c7 d8c8 d8c9 d8ca d8cb d8cc "
-               + "d8cd d8ce d8cf d8d0 d8d1 d8d2 d8d3 d8d4 d8d5 d8d6 d8d7 "
-               + "d8d8 d8d9 d8da d8db d8dc d8dd d8de d8df d8e0 d8e1 d8e2 "
-               + "d8e3 d8e4 d8e5 d8e6 d8e7 d8e8 d8e9 d8ea d8eb d8ec d8ed "
-               + "d8ee d8ef d8f0 d8f1 d8f2 d8f3 d8f4 d8f5 d8f6 d8f7 d8f8 "
-               + "d8f9 d8fa d8fb d8fc d8fd d8fe d8ff d900 d901 d902 d903 "
-               + "d904 d905 d906 d907 d908 d909 d90a d90b d90c d90d d90e "
-               + "d90f d910 d911 d912 d913 d914 d915 d916 d917 d918 d919 "
-               + "d91a d91b d91c d91d d91e d91f d920 d921 d922 d923 d924 "
-               + "d925 d926 d927 d928 d929 d92a d92b d92c d92d d92e d92f "
-               + "d930 d931 d932 d933 d934 d935 d936 d937 d938 d939 d93a "
-               + "d93b d93c d93d d93e d93f d940 d941 d942 d943 d944 d945 "
-               + "d946 d947 d948 d949 d94a d94b d94c d94d d94e d94f d950 "
-               + "d951 d952 d953 d954 d955 d956 d957 d958 d959 d95a d95b "
-               + "d95c d95d d95e d95f d960 d961 d962 d963 d964 d965 d966 "
-               + "d967 d968 d969 d96a d96b d96c d96d d96e d96f d970 d971 "
-               + "d972 d973 d974 d975 d976 d977 d978 d979 d97a d97b d97c "
-               + "d97d d97e d97f d980 d981 d982 d983 d984 d985 d986 d987 "
-               + "d988 d989 d98a d98b d98c d98d d98e d98f d990 d991 d992 "
-               + "d993 d994 d995 d996 d997 d998 d999 d99a d99b d99c d99d "
-               + "d99e d99f d9a0 d9a1 d9a2 d9a3 d9a4 d9a5 d9a6 d9a7 d9a8 "
-               + "d9a9 d9aa d9ab d9ac d9ad d9ae d9af d9b0 d9b1 d9b2 d9b3 "
-               + "d9b4 d9b5 d9b6 d9b7 d9b8 d9b9 d9ba d9bb d9bc d9bd d9be "
-               + "d9bf d9c0 d9c1 d9c2 d9c3 d9c4 d9c5 d9c6 d9c7 d9c8 d9c9 "
-               + "d9ca d9cb d9cc d9cd d9ce d9cf d9d0 d9d1 d9d2 d9d3 d9d4 "
-               + "d9d5 d9d6 d9d7 d9d8 d9d9 d9da d9db d9dc d9dd d9de d9df "
-               + "d9e0 d9e1 d9e2 d9e3 d9e4 d9e5 d9e6 d9e7 d9e8 d9e9 d9ea "
-               + "d9eb d9ec d9ed d9ee d9ef d9f0 d9f1 d9f2 d9f3 d9f4 d9f5 "
-               + "d9f6 d9f7 d9f8 d9f9 d9fa d9fb d9fc d9fd d9fe d9ff da00 "
-               + "da01 da02 da03 da04 da05 da06 da07 da08 da09 da0a da0b "
-               + "da0c da0d da0e da0f da10 da11 da12 da13 da14 da15 da16 "
-               + "da17 da18 da19 da1a da1b da1c da1d da1e da1f da20 da21 "
-               + "da22 da23 da24 da25 da26 da27 da28 da29 da2a da2b da2c "
-               + "da2d da2e da2f da30 da31 da32 da33 da34 da35 da36 da37 "
-               + "da38 da39 da3a da3b da3c da3d da3e da3f da40 da41 da42 "
-               + "da43 da44 da45 da46 da47 da48 da49 da4a da4b da4c da4d "
-               + "da4e da4f da50 da51 da52 da53 da54 da55 da56 da57 da58 "
-               + "da59 da5a da5b da5c da5d da5e da5f da60 da61 da62 da63 "
-               + "da64 da65 da66 da67 da68 da69 da6a da6b da6c da6d da6e "
-               + "da6f da70 da71 da72 da73 da74 da75 da76 da77 da78 da79 "
-               + "da7a da7b da7c da7d da7e da7f da80 da81 da82 da83 da84 "
-               + "da85 da86 da87 da88 da89 da8a da8b da8c da8d da8e da8f "
-               + "da90 da91 da92 da93 da94 da95 da96 da97 da98 da99 da9a "
-               + "da9b da9c da9d da9e da9f daa0 daa1 daa2 daa3 daa4 daa5 "
-               + "daa6 daa7 daa8 daa9 daaa daab daac daad daae daaf dab0 "
-               + "dab1 dab2 dab3 dab4 dab5 dab6 dab7 dab8 dab9 daba dabb "
-               + "dabc dabd dabe dabf dac0 dac1 dac2 dac3 dac4 dac5 dac6 "
-               + "dac7 dac8 dac9 daca dacb dacc dacd dace dacf dad0 dad1 "
-               + "dad2 dad3 dad4 dad5 dad6 dad7 dad8 dad9 dada dadb dadc "
-               + "dadd dade dadf dae0 dae1 dae2 dae3 dae4 dae5 dae6 dae7 "
-               + "dae8 dae9 daea daeb daec daed daee daef daf0 daf1 daf2 "
-               + "daf3 daf4 daf5 daf6 daf7 daf8 daf9 dafa dafb dafc dafd "
-               + "dafe daff db00 db01 db02 db03 db04 db05 db06 db07 db08 "
-               + "db09 db0a db0b db0c db0d db0e db0f db10 db11 db12 db13 "
-               + "db14 db15 db16 db17 db18 db19 db1a db1b db1c db1d db1e "
-               + "db1f db20 db21 db22 db23 db24 db25 db26 db27 db28 db29 "
-               + "db2a db2b db2c db2d db2e db2f db30 db31 db32 db33 db34 "
-               + "db35 db36 db37 db38 db39 db3a db3b db3c db3d db3e db3f "
-               + "db40 db41 db42 db43 db44 db45 db46 db47 db48 db49 db4a "
-               + "db4b db4c db4d db4e db4f db50 db51 db52 db53 db54 db55 "
-               + "db56 db57 db58 db59 db5a db5b db5c db5d db5e db5f db60 "
-               + "db61 db62 db63 db64 db65 db66 db67 db68 db69 db6a db6b "
-               + "db6c db6d db6e db6f db70 db71 db72 db73 db74 db75 db76 "
-               + "db77 db78 db79 db7a db7b db7c db7d db7e db7f db80 db81 "
-               + "db82 db83 db84 db85 db86 db87 db88 db89 db8a db8b db8c "
-               + "db8d db8e db8f db90 db91 db92 db93 db94 db95 db96 db97 "
-               + "db98 db99 db9a db9b db9c db9d db9e db9f dba0 dba1 dba2 "
-               + "dba3 dba4 dba5 dba6 dba7 dba8 dba9 dbaa dbab dbac dbad "
-               + "dbae dbaf dbb0 dbb1 dbb2 dbb3 dbb4 dbb5 dbb6 dbb7 dbb8 "
-               + "dbb9 dbba dbbb dbbc dbbd dbbe dbbf dbc0 dbc1 dbc2 dbc3 "
-               + "dbc4 dbc5 dbc6 dbc7 dbc8 dbc9 dbca dbcb dbcc dbcd dbce "
-               + "dbcf dbd0 dbd1 dbd2 dbd3 dbd4 dbd5 dbd6 dbd7 dbd8 dbd9 "
-               + "dbda dbdb dbdc dbdd dbde dbdf dbe0 dbe1 dbe2 dbe3 dbe4 "
-               + "dbe5 dbe6 dbe7 dbe8 dbe9 dbea dbeb dbec dbed dbee dbef "
-               + "dbf0 dbf1 dbf2 dbf3 dbf4 dbf5 dbf6 dbf7 dbf8 dbf9 dbfa "
-               + "dbfb dbfc dbfd dbfe dbff dc00 dc01 dc02 dc03 dc04 dc05 "
-               + "dc06 dc07 dc08 dc09 dc0a dc0b dc0c dc0d dc0e dc0f dc10 "
-               + "dc11 dc12 dc13 dc14 dc15 dc16 dc17 dc18 dc19 dc1a dc1b "
-               + "dc1c dc1d dc1e dc1f dc20 dc21 dc22 dc23 dc24 dc25 dc26 "
-               + "dc27 dc28 dc29 dc2a dc2b dc2c dc2d dc2e dc2f dc30 dc31 "
-               + "dc32 dc33 dc34 dc35 dc36 dc37 dc38 dc39 dc3a dc3b dc3c "
-               + "dc3d dc3e dc3f dc40 dc41 dc42 dc43 dc44 dc45 dc46 dc47 "
-               + "dc48 dc49 dc4a dc4b dc4c dc4d dc4e dc4f dc50 dc51 dc52 "
-               + "dc53 dc54 dc55 dc56 dc57 dc58 dc59 dc5a dc5b dc5c dc5d "
-               + "dc5e dc5f dc60 dc61 dc62 dc63 dc64 dc65 dc66 dc67 dc68 "
-               + "dc69 dc6a dc6b dc6c dc6d dc6e dc6f dc70 dc71 dc72 dc73 "
-               + "dc74 dc75 dc76 dc77 dc78 dc79 dc7a dc7b dc7c dc7d dc7e "
-               + "dc7f dc80 dc81 dc82 dc83 dc84 dc85 dc86 dc87 dc88 dc89 "
-               + "dc8a dc8b dc8c dc8d dc8e dc8f dc90 dc91 dc92 dc93 dc94 "
-               + "dc95 dc96 dc97 dc98 dc99 dc9a dc9b dc9c dc9d dc9e dc9f "
-               + "dca0 dca1 dca2 dca3 dca4 dca5 dca6 dca7 dca8 dca9 dcaa "
-               + "dcab dcac dcad dcae dcaf dcb0 dcb1 dcb2 dcb3 dcb4 dcb5 "
-               + "dcb6 dcb7 dcb8 dcb9 dcba dcbb dcbc dcbd dcbe dcbf dcc0 "
-               + "dcc1 dcc2 dcc3 dcc4 dcc5 dcc6 dcc7 dcc8 dcc9 dcca dccb "
-               + "dccc dccd dcce dccf dcd0 dcd1 dcd2 dcd3 dcd4 dcd5 dcd6 "
-               + "dcd7 dcd8 dcd9 dcda dcdb dcdc dcdd dcde dcdf dce0 dce1 "
-               + "dce2 dce3 dce4 dce5 dce6 dce7 dce8 dce9 dcea dceb dcec "
-               + "dced dcee dcef dcf0 dcf1 dcf2 dcf3 dcf4 dcf5 dcf6 dcf7 "
-               + "dcf8 dcf9 dcfa dcfb dcfc dcfd dcfe dcff dd00 dd01 dd02 "
-               + "dd03 dd04 dd05 dd06 dd07 dd08 dd09 dd0a dd0b dd0c dd0d "
-               + "dd0e dd0f dd10 dd11 dd12 dd13 dd14 dd15 dd16 dd17 dd18 "
-               + "dd19 dd1a dd1b dd1c dd1d dd1e dd1f dd20 dd21 dd22 dd23 "
-               + "dd24 dd25 dd26 dd27 dd28 dd29 dd2a dd2b dd2c dd2d dd2e "
-               + "dd2f dd30 dd31 dd32 dd33 dd34 dd35 dd36 dd37 dd38 dd39 "
-               + "dd3a dd3b dd3c dd3d dd3e dd3f dd40 dd41 dd42 dd43 dd44 "
-               + "dd45 dd46 dd47 dd48 dd49 dd4a dd4b dd4c dd4d dd4e dd4f "
-               + "dd50 dd51 dd52 dd53 dd54 dd55 dd56 dd57 dd58 dd59 dd5a "
-               + "dd5b dd5c dd5d dd5e dd5f dd60 dd61 dd62 dd63 dd64 dd65 "
-               + "dd66 dd67 dd68 dd69 dd6a dd6b dd6c dd6d dd6e dd6f dd70 "
-               + "dd71 dd72 dd73 dd74 dd75 dd76 dd77 dd78 dd79 dd7a dd7b "
-               + "dd7c dd7d dd7e dd7f dd80 dd81 dd82 dd83 dd84 dd85 dd86 "
-               + "dd87 dd88 dd89 dd8a dd8b dd8c dd8d dd8e dd8f dd90 dd91 "
-               + "dd92 dd93 dd94 dd95 dd96 dd97 dd98 dd99 dd9a dd9b dd9c "
-               + "dd9d dd9e dd9f dda0 dda1 dda2 dda3 dda4 dda5 dda6 dda7 "
-               + "dda8 dda9 ddaa ddab ddac ddad ddae ddaf ddb0 ddb1 ddb2 "
-               + "ddb3 ddb4 ddb5 ddb6 ddb7 ddb8 ddb9 ddba ddbb ddbc ddbd "
-               + "ddbe ddbf ddc0 ddc1 ddc2 ddc3 ddc4 ddc5 ddc6 ddc7 ddc8 "
-               + "ddc9 ddca ddcb ddcc ddcd ddce ddcf ddd0 ddd1 ddd2 ddd3 "
-               + "ddd4 ddd5 ddd6 ddd7 ddd8 ddd9 ddda dddb dddc dddd ddde "
-               + "dddf dde0 dde1 dde2 dde3 dde4 dde5 dde6 dde7 dde8 dde9 "
-               + "ddea ddeb ddec dded ddee ddef ddf0 ddf1 ddf2 ddf3 ddf4 "
-               + "ddf5 ddf6 ddf7 ddf8 ddf9 ddfa ddfb ddfc ddfd ddfe ddff "
-               + "de00 de01 de02 de03 de04 de05 de06 de07 de08 de09 de0a "
-               + "de0b de0c de0d de0e de0f de10 de11 de12 de13 de14 de15 "
-               + "de16 de17 de18 de19 de1a de1b de1c de1d de1e de1f de20 "
-               + "de21 de22 de23 de24 de25 de26 de27 de28 de29 de2a de2b "
-               + "de2c de2d de2e de2f de30 de31 de32 de33 de34 de35 de36 "
-               + "de37 de38 de39 de3a de3b de3c de3d de3e de3f de40 de41 "
-               + "de42 de43 de44 de45 de46 de47 de48 de49 de4a de4b de4c "
-               + "de4d de4e de4f de50 de51 de52 de53 de54 de55 de56 de57 "
-               + "de58 de59 de5a de5b de5c de5d de5e de5f de60 de61 de62 "
-               + "de63 de64 de65 de66 de67 de68 de69 de6a de6b de6c de6d "
-               + "de6e de6f de70 de71 de72 de73 de74 de75 de76 de77 de78 "
-               + "de79 de7a de7b de7c de7d de7e de7f de80 de81 de82 de83 "
-               + "de84 de85 de86 de87 de88 de89 de8a de8b de8c de8d de8e "
-               + "de8f de90 de91 de92 de93 de94 de95 de96 de97 de98 de99 "
-               + "de9a de9b de9c de9d de9e de9f dea0 dea1 dea2 dea3 dea4 "
-               + "dea5 dea6 dea7 dea8 dea9 deaa deab deac dead deae deaf "
-               + "deb0 deb1 deb2 deb3 deb4 deb5 deb6 deb7 deb8 deb9 deba "
-               + "debb debc debd debe debf dec0 dec1 dec2 dec3 dec4 dec5 "
-               + "dec6 dec7 dec8 dec9 deca decb decc decd dece decf ded0 "
-               + "ded1 ded2 ded3 ded4 ded5 ded6 ded7 ded8 ded9 deda dedb "
-               + "dedc dedd dede dedf dee0 dee1 dee2 dee3 dee4 dee5 dee6 "
-               + "dee7 dee8 dee9 deea deeb deec deed deee deef def0 def1 "
-               + "def2 def3 def4 def5 def6 def7 def8 def9 defa defb defc "
-               + "defd defe deff df00 df01 df02 df03 df04 df05 df06 df07 "
-               + "df08 df09 df0a df0b df0c df0d df0e df0f df10 df11 df12 "
-               + "df13 df14 df15 df16 df17 df18 df19 df1a df1b df1c df1d "
-               + "df1e df1f df20 df21 df22 df23 df24 df25 df26 df27 df28 "
-               + "df29 df2a df2b df2c df2d df2e df2f df30 df31 df32 df33 "
-               + "df34 df35 df36 df37 df38 df39 df3a df3b df3c df3d df3e "
-               + "df3f df40 df41 df42 df43 df44 df45 df46 df47 df48 df49 "
-               + "df4a df4b df4c df4d df4e df4f df50 df51 df52 df53 df54 "
-               + "df55 df56 df57 df58 df59 df5a df5b df5c df5d df5e df5f "
-               + "df60 df61 df62 df63 df64 df65 df66 df67 df68 df69 df6a "
-               + "df6b df6c df6d df6e df6f df70 df71 df72 df73 df74 df75 "
-               + "df76 df77 df78 df79 df7a df7b df7c df7d df7e df7f df80 "
-               + "df81 df82 df83 df84 df85 df86 df87 df88 df89 df8a df8b "
-               + "df8c df8d df8e df8f df90 df91 df92 df93 df94 df95 df96 "
-               + "df97 df98 df99 df9a df9b df9c df9d df9e df9f dfa0 dfa1 "
-               + "dfa2 dfa3 dfa4 dfa5 dfa6 dfa7 dfa8 dfa9 dfaa dfab dfac "
-               + "dfad dfae dfaf dfb0 dfb1 dfb2 dfb3 dfb4 dfb5 dfb6 dfb7 "
-               + "dfb8 dfb9 dfba dfbb dfbc dfbd dfbe dfbf dfc0 dfc1 dfc2 "
-               + "dfc3 dfc4 dfc5 dfc6 dfc7 dfc8 dfc9 dfca dfcb dfcc dfcd "
-               + "dfce dfcf dfd0 dfd1 dfd2 dfd3 dfd4 dfd5 dfd6 dfd7 dfd8 "
-               + "dfd9 dfda dfdb dfdc dfdd dfde dfdf dfe0 dfe1 dfe2 dfe3 "
-               + "dfe4 dfe5 dfe6 dfe7 dfe8 dfe9 dfea dfeb dfec dfed dfee "
-               + "dfef dff0 dff1 dff2 dff3 dff4 dff5 dff6 dff7 dff8 dff9 "
-               + "dffa dffb dffc dffd dffe dfff found 2048 chars.";
-
-               string symbolChars = "24 2b 3c 3d 3e 5e 60 7c 7e a2 a3 a4 a5 "
-               + "a6 a7 a8 a9 ac ae af b0 b1 b4 b6 b8 d7 f7 2c2 2c3 2c4 2c5 "
-               + "2d2 2d3 2d4 2d5 2d6 2d7 2d8 2d9 2da 2db 2dc 2dd 2de 2df "
-               + "2e5 2e6 2e7 2e8 2e9 2ea 2eb 2ec 2ed 2ef 2f0 2f1 2f2 2f3 "
-               + "2f4 2f5 2f6 2f7 2f8 2f9 2fa 2fb 2fc 2fd 2fe 2ff 374 375 "
-               + "384 385 3f6 482 60b 60e 60f 6e9 6fd 6fe 7f6 9f2 9f3 9fa "
-               + "af1 b70 bf3 bf4 bf5 bf6 bf7 bf8 bf9 bfa cf1 cf2 e3f f01 "
-               + "f02 f03 f13 f14 f15 f16 f17 f1a f1b f1c f1d f1e f1f f34 "
-               + "f36 f38 fbe fbf fc0 fc1 fc2 fc3 fc4 fc5 fc7 fc8 fc9 fca "
-               + "fcb fcc fcf 1360 1390 1391 1392 1393 1394 1395 1396 1397 "
-               + "1398 1399 17db 1940 19e0 19e1 19e2 19e3 19e4 19e5 19e6 "
-               + "19e7 19e8 19e9 19ea 19eb 19ec 19ed 19ee 19ef 19f0 19f1 "
-               + "19f2 19f3 19f4 19f5 19f6 19f7 19f8 19f9 19fa 19fb 19fc "
-               + "19fd 19fe 19ff 1b61 1b62 1b63 1b64 1b65 1b66 1b67 1b68 "
-               + "1b69 1b6a 1b74 1b75 1b76 1b77 1b78 1b79 1b7a 1b7b 1b7c "
-               + "1fbd 1fbf 1fc0 1fc1 1fcd 1fce 1fcf 1fdd 1fde 1fdf 1fed "
-               + "1fee 1fef 1ffd 1ffe 2044 2052 207a 207b 207c 208a 208b "
-               + "208c 20a0 20a1 20a2 20a3 20a4 20a5 20a6 20a7 20a8 20a9 "
-               + "20aa 20ab 20ac 20ad 20ae 20af 20b0 20b1 20b2 20b3 20b4 "
-               + "20b5 2100 2101 2103 2104 2105 2106 2108 2109 2114 2116 "
-               + "2117 2118 211e 211f 2120 2121 2122 2123 2125 2127 2129 "
-               + "212e 213a 213b 2140 2141 2142 2143 2144 214a 214b 214c "
-               + "214d 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 "
-               + "219a 219b 219c 219d 219e 219f 21a0 21a1 21a2 21a3 21a4 "
-               + "21a5 21a6 21a7 21a8 21a9 21aa 21ab 21ac 21ad 21ae 21af "
-               + "21b0 21b1 21b2 21b3 21b4 21b5 21b6 21b7 21b8 21b9 21ba "
-               + "21bb 21bc 21bd 21be 21bf 21c0 21c1 21c2 21c3 21c4 21c5 "
-               + "21c6 21c7 21c8 21c9 21ca 21cb 21cc 21cd 21ce 21cf 21d0 "
-               + "21d1 21d2 21d3 21d4 21d5 21d6 21d7 21d8 21d9 21da 21db "
-               + "21dc 21dd 21de 21df 21e0 21e1 21e2 21e3 21e4 21e5 21e6 "
-               + "21e7 21e8 21e9 21ea 21eb 21ec 21ed 21ee 21ef 21f0 21f1 "
-               + "21f2 21f3 21f4 21f5 21f6 21f7 21f8 21f9 21fa 21fb 21fc "
-               + "21fd 21fe 21ff 2200 2201 2202 2203 2204 2205 2206 2207 "
-               + "2208 2209 220a 220b 220c 220d 220e 220f 2210 2211 2212 "
-               + "2213 2214 2215 2216 2217 2218 2219 221a 221b 221c 221d "
-               + "221e 221f 2220 2221 2222 2223 2224 2225 2226 2227 2228 "
-               + "2229 222a 222b 222c 222d 222e 222f 2230 2231 2232 2233 "
-               + "2234 2235 2236 2237 2238 2239 223a 223b 223c 223d 223e "
-               + "223f 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 "
-               + "224a 224b 224c 224d 224e 224f 2250 2251 2252 2253 2254 "
-               + "2255 2256 2257 2258 2259 225a 225b 225c 225d 225e 225f "
-               + "2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 226a "
-               + "226b 226c 226d 226e 226f 2270 2271 2272 2273 2274 2275 "
-               + "2276 2277 2278 2279 227a 227b 227c 227d 227e 227f 2280 "
-               + "2281 2282 2283 2284 2285 2286 2287 2288 2289 228a 228b "
-               + "228c 228d 228e 228f 2290 2291 2292 2293 2294 2295 2296 "
-               + "2297 2298 2299 229a 229b 229c 229d 229e 229f 22a0 22a1 "
-               + "22a2 22a3 22a4 22a5 22a6 22a7 22a8 22a9 22aa 22ab 22ac "
-               + "22ad 22ae 22af 22b0 22b1 22b2 22b3 22b4 22b5 22b6 22b7 "
-               + "22b8 22b9 22ba 22bb 22bc 22bd 22be 22bf 22c0 22c1 22c2 "
-               + "22c3 22c4 22c5 22c6 22c7 22c8 22c9 22ca 22cb 22cc 22cd "
-               + "22ce 22cf 22d0 22d1 22d2 22d3 22d4 22d5 22d6 22d7 22d8 "
-               + "22d9 22da 22db 22dc 22dd 22de 22df 22e0 22e1 22e2 22e3 "
-               + "22e4 22e5 22e6 22e7 22e8 22e9 22ea 22eb 22ec 22ed 22ee "
-               + "22ef 22f0 22f1 22f2 22f3 22f4 22f5 22f6 22f7 22f8 22f9 "
-               + "22fa 22fb 22fc 22fd 22fe 22ff 2300 2301 2302 2303 2304 "
-               + "2305 2306 2307 2308 2309 230a 230b 230c 230d 230e 230f "
-               + "2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 231a "
-               + "231b 231c 231d 231e 231f 2320 2321 2322 2323 2324 2325 "
-               + "2326 2327 2328 232b 232c 232d 232e 232f 2330 2331 2332 "
-               + "2333 2334 2335 2336 2337 2338 2339 233a 233b 233c 233d "
-               + "233e 233f 2340 2341 2342 2343 2344 2345 2346 2347 2348 "
-               + "2349 234a 234b 234c 234d 234e 234f 2350 2351 2352 2353 "
-               + "2354 2355 2356 2357 2358 2359 235a 235b 235c 235d 235e "
-               + "235f 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 "
-               + "236a 236b 236c 236d 236e 236f 2370 2371 2372 2373 2374 "
-               + "2375 2376 2377 2378 2379 237a 237b 237c 237d 237e 237f "
-               + "2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 238a "
-               + "238b 238c 238d 238e 238f 2390 2391 2392 2393 2394 2395 "
-               + "2396 2397 2398 2399 239a 239b 239c 239d 239e 239f 23a0 "
-               + "23a1 23a2 23a3 23a4 23a5 23a6 23a7 23a8 23a9 23aa 23ab "
-               + "23ac 23ad 23ae 23af 23b0 23b1 23b2 23b3 23b4 23b5 23b6 "
-               + "23b7 23b8 23b9 23ba 23bb 23bc 23bd 23be 23bf 23c0 23c1 "
-               + "23c2 23c3 23c4 23c5 23c6 23c7 23c8 23c9 23ca 23cb 23cc "
-               + "23cd 23ce 23cf 23d0 23d1 23d2 23d3 23d4 23d5 23d6 23d7 "
-               + "23d8 23d9 23da 23db 23dc 23dd 23de 23df 23e0 23e1 23e2 "
-               + "23e3 23e4 23e5 23e6 23e7 2400 2401 2402 2403 2404 2405 "
-               + "2406 2407 2408 2409 240a 240b 240c 240d 240e 240f 2410 "
-               + "2411 2412 2413 2414 2415 2416 2417 2418 2419 241a 241b "
-               + "241c 241d 241e 241f 2420 2421 2422 2423 2424 2425 2426 "
-               + "2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 244a "
-               + "249c 249d 249e 249f 24a0 24a1 24a2 24a3 24a4 24a5 24a6 "
-               + "24a7 24a8 24a9 24aa 24ab 24ac 24ad 24ae 24af 24b0 24b1 "
-               + "24b2 24b3 24b4 24b5 24b6 24b7 24b8 24b9 24ba 24bb 24bc "
-               + "24bd 24be 24bf 24c0 24c1 24c2 24c3 24c4 24c5 24c6 24c7 "
-               + "24c8 24c9 24ca 24cb 24cc 24cd 24ce 24cf 24d0 24d1 24d2 "
-               + "24d3 24d4 24d5 24d6 24d7 24d8 24d9 24da 24db 24dc 24dd "
-               + "24de 24df 24e0 24e1 24e2 24e3 24e4 24e5 24e6 24e7 24e8 "
-               + "24e9 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 "
-               + "250a 250b 250c 250d 250e 250f 2510 2511 2512 2513 2514 "
-               + "2515 2516 2517 2518 2519 251a 251b 251c 251d 251e 251f "
-               + "2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 252a "
-               + "252b 252c 252d 252e 252f 2530 2531 2532 2533 2534 2535 "
-               + "2536 2537 2538 2539 253a 253b 253c 253d 253e 253f 2540 "
-               + "2541 2542 2543 2544 2545 2546 2547 2548 2549 254a 254b "
-               + "254c 254d 254e 254f 2550 2551 2552 2553 2554 2555 2556 "
-               + "2557 2558 2559 255a 255b 255c 255d 255e 255f 2560 2561 "
-               + "2562 2563 2564 2565 2566 2567 2568 2569 256a 256b 256c "
-               + "256d 256e 256f 2570 2571 2572 2573 2574 2575 2576 2577 "
-               + "2578 2579 257a 257b 257c 257d 257e 257f 2580 2581 2582 "
-               + "2583 2584 2585 2586 2587 2588 2589 258a 258b 258c 258d "
-               + "258e 258f 2590 2591 2592 2593 2594 2595 2596 2597 2598 "
-               + "2599 259a 259b 259c 259d 259e 259f 25a0 25a1 25a2 25a3 "
-               + "25a4 25a5 25a6 25a7 25a8 25a9 25aa 25ab 25ac 25ad 25ae "
-               + "25af 25b0 25b1 25b2 25b3 25b4 25b5 25b6 25b7 25b8 25b9 "
-               + "25ba 25bb 25bc 25bd 25be 25bf 25c0 25c1 25c2 25c3 25c4 "
-               + "25c5 25c6 25c7 25c8 25c9 25ca 25cb 25cc 25cd 25ce 25cf "
-               + "25d0 25d1 25d2 25d3 25d4 25d5 25d6 25d7 25d8 25d9 25da "
-               + "25db 25dc 25dd 25de 25df 25e0 25e1 25e2 25e3 25e4 25e5 "
-               + "25e6 25e7 25e8 25e9 25ea 25eb 25ec 25ed 25ee 25ef 25f0 "
-               + "25f1 25f2 25f3 25f4 25f5 25f6 25f7 25f8 25f9 25fa 25fb "
-               + "25fc 25fd 25fe 25ff 2600 2601 2602 2603 2604 2605 2606 "
-               + "2607 2608 2609 260a 260b 260c 260d 260e 260f 2610 2611 "
-               + "2612 2613 2614 2615 2616 2617 2618 2619 261a 261b 261c "
-               + "261d 261e 261f 2620 2621 2622 2623 2624 2625 2626 2627 "
-               + "2628 2629 262a 262b 262c 262d 262e 262f 2630 2631 2632 "
-               + "2633 2634 2635 2636 2637 2638 2639 263a 263b 263c 263d "
-               + "263e 263f 2640 2641 2642 2643 2644 2645 2646 2647 2648 "
-               + "2649 264a 264b 264c 264d 264e 264f 2650 2651 2652 2653 "
-               + "2654 2655 2656 2657 2658 2659 265a 265b 265c 265d 265e "
-               + "265f 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 "
-               + "266a 266b 266c 266d 266e 266f 2670 2671 2672 2673 2674 "
-               + "2675 2676 2677 2678 2679 267a 267b 267c 267d 267e 267f "
-               + "2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 268a "
-               + "268b 268c 268d 268e 268f 2690 2691 2692 2693 2694 2695 "
-               + "2696 2697 2698 2699 269a 269b 269c 26a0 26a1 26a2 26a3 "
-               + "26a4 26a5 26a6 26a7 26a8 26a9 26aa 26ab 26ac 26ad 26ae "
-               + "26af 26b0 26b1 26b2 2701 2702 2703 2704 2706 2707 2708 "
-               + "2709 270c 270d 270e 270f 2710 2711 2712 2713 2714 2715 "
-               + "2716 2717 2718 2719 271a 271b 271c 271d 271e 271f 2720 "
-               + "2721 2722 2723 2724 2725 2726 2727 2729 272a 272b 272c "
-               + "272d 272e 272f 2730 2731 2732 2733 2734 2735 2736 2737 "
-               + "2738 2739 273a 273b 273c 273d 273e 273f 2740 2741 2742 "
-               + "2743 2744 2745 2746 2747 2748 2749 274a 274b 274d 274f "
-               + "2750 2751 2752 2756 2758 2759 275a 275b 275c 275d 275e "
-               + "2761 2762 2763 2764 2765 2766 2767 2794 2798 2799 279a "
-               + "279b 279c 279d 279e 279f 27a0 27a1 27a2 27a3 27a4 27a5 "
-               + "27a6 27a7 27a8 27a9 27aa 27ab 27ac 27ad 27ae 27af 27b1 "
-               + "27b2 27b3 27b4 27b5 27b6 27b7 27b8 27b9 27ba 27bb 27bc "
-               + "27bd 27be 27c0 27c1 27c2 27c3 27c4 27c7 27c8 27c9 27ca "
-               + "27d0 27d1 27d2 27d3 27d4 27d5 27d6 27d7 27d8 27d9 27da "
-               + "27db 27dc 27dd 27de 27df 27e0 27e1 27e2 27e3 27e4 27e5 "
-               + "27f0 27f1 27f2 27f3 27f4 27f5 27f6 27f7 27f8 27f9 27fa "
-               + "27fb 27fc 27fd 27fe 27ff 2800 2801 2802 2803 2804 2805 "
-               + "2806 2807 2808 2809 280a 280b 280c 280d 280e 280f 2810 "
-               + "2811 2812 2813 2814 2815 2816 2817 2818 2819 281a 281b "
-               + "281c 281d 281e 281f 2820 2821 2822 2823 2824 2825 2826 "
-               + "2827 2828 2829 282a 282b 282c 282d 282e 282f 2830 2831 "
-               + "2832 2833 2834 2835 2836 2837 2838 2839 283a 283b 283c "
-               + "283d 283e 283f 2840 2841 2842 2843 2844 2845 2846 2847 "
-               + "2848 2849 284a 284b 284c 284d 284e 284f 2850 2851 2852 "
-               + "2853 2854 2855 2856 2857 2858 2859 285a 285b 285c 285d "
-               + "285e 285f 2860 2861 2862 2863 2864 2865 2866 2867 2868 "
-               + "2869 286a 286b 286c 286d 286e 286f 2870 2871 2872 2873 "
-               + "2874 2875 2876 2877 2878 2879 287a 287b 287c 287d 287e "
-               + "287f 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 "
-               + "288a 288b 288c 288d 288e 288f 2890 2891 2892 2893 2894 "
-               + "2895 2896 2897 2898 2899 289a 289b 289c 289d 289e 289f "
-               + "28a0 28a1 28a2 28a3 28a4 28a5 28a6 28a7 28a8 28a9 28aa "
-               + "28ab 28ac 28ad 28ae 28af 28b0 28b1 28b2 28b3 28b4 28b5 "
-               + "28b6 28b7 28b8 28b9 28ba 28bb 28bc 28bd 28be 28bf 28c0 "
-               + "28c1 28c2 28c3 28c4 28c5 28c6 28c7 28c8 28c9 28ca 28cb "
-               + "28cc 28cd 28ce 28cf 28d0 28d1 28d2 28d3 28d4 28d5 28d6 "
-               + "28d7 28d8 28d9 28da 28db 28dc 28dd 28de 28df 28e0 28e1 "
-               + "28e2 28e3 28e4 28e5 28e6 28e7 28e8 28e9 28ea 28eb 28ec "
-               + "28ed 28ee 28ef 28f0 28f1 28f2 28f3 28f4 28f5 28f6 28f7 "
-               + "28f8 28f9 28fa 28fb 28fc 28fd 28fe 28ff 2900 2901 2902 "
-               + "2903 2904 2905 2906 2907 2908 2909 290a 290b 290c 290d "
-               + "290e 290f 2910 2911 2912 2913 2914 2915 2916 2917 2918 "
-               + "2919 291a 291b 291c 291d 291e 291f 2920 2921 2922 2923 "
-               + "2924 2925 2926 2927 2928 2929 292a 292b 292c 292d 292e "
-               + "292f 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 "
-               + "293a 293b 293c 293d 293e 293f 2940 2941 2942 2943 2944 "
-               + "2945 2946 2947 2948 2949 294a 294b 294c 294d 294e 294f "
-               + "2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 295a "
-               + "295b 295c 295d 295e 295f 2960 2961 2962 2963 2964 2965 "
-               + "2966 2967 2968 2969 296a 296b 296c 296d 296e 296f 2970 "
-               + "2971 2972 2973 2974 2975 2976 2977 2978 2979 297a 297b "
-               + "297c 297d 297e 297f 2980 2981 2982 2999 299a 299b 299c "
-               + "299d 299e 299f 29a0 29a1 29a2 29a3 29a4 29a5 29a6 29a7 "
-               + "29a8 29a9 29aa 29ab 29ac 29ad 29ae 29af 29b0 29b1 29b2 "
-               + "29b3 29b4 29b5 29b6 29b7 29b8 29b9 29ba 29bb 29bc 29bd "
-               + "29be 29bf 29c0 29c1 29c2 29c3 29c4 29c5 29c6 29c7 29c8 "
-               + "29c9 29ca 29cb 29cc 29cd 29ce 29cf 29d0 29d1 29d2 29d3 "
-               + "29d4 29d5 29d6 29d7 29dc 29dd 29de 29df 29e0 29e1 29e2 "
-               + "29e3 29e4 29e5 29e6 29e7 29e8 29e9 29ea 29eb 29ec 29ed "
-               + "29ee 29ef 29f0 29f1 29f2 29f3 29f4 29f5 29f6 29f7 29f8 "
-               + "29f9 29fa 29fb 29fe 29ff 2a00 2a01 2a02 2a03 2a04 2a05 "
-               + "2a06 2a07 2a08 2a09 2a0a 2a0b 2a0c 2a0d 2a0e 2a0f 2a10 "
-               + "2a11 2a12 2a13 2a14 2a15 2a16 2a17 2a18 2a19 2a1a 2a1b "
-               + "2a1c 2a1d 2a1e 2a1f 2a20 2a21 2a22 2a23 2a24 2a25 2a26 "
-               + "2a27 2a28 2a29 2a2a 2a2b 2a2c 2a2d 2a2e 2a2f 2a30 2a31 "
-               + "2a32 2a33 2a34 2a35 2a36 2a37 2a38 2a39 2a3a 2a3b 2a3c "
-               + "2a3d 2a3e 2a3f 2a40 2a41 2a42 2a43 2a44 2a45 2a46 2a47 "
-               + "2a48 2a49 2a4a 2a4b 2a4c 2a4d 2a4e 2a4f 2a50 2a51 2a52 "
-               + "2a53 2a54 2a55 2a56 2a57 2a58 2a59 2a5a 2a5b 2a5c 2a5d "
-               + "2a5e 2a5f 2a60 2a61 2a62 2a63 2a64 2a65 2a66 2a67 2a68 "
-               + "2a69 2a6a 2a6b 2a6c 2a6d 2a6e 2a6f 2a70 2a71 2a72 2a73 "
-               + "2a74 2a75 2a76 2a77 2a78 2a79 2a7a 2a7b 2a7c 2a7d 2a7e "
-               + "2a7f 2a80 2a81 2a82 2a83 2a84 2a85 2a86 2a87 2a88 2a89 "
-               + "2a8a 2a8b 2a8c 2a8d 2a8e 2a8f 2a90 2a91 2a92 2a93 2a94 "
-               + "2a95 2a96 2a97 2a98 2a99 2a9a 2a9b 2a9c 2a9d 2a9e 2a9f "
-               + "2aa0 2aa1 2aa2 2aa3 2aa4 2aa5 2aa6 2aa7 2aa8 2aa9 2aaa "
-               + "2aab 2aac 2aad 2aae 2aaf 2ab0 2ab1 2ab2 2ab3 2ab4 2ab5 "
-               + "2ab6 2ab7 2ab8 2ab9 2aba 2abb 2abc 2abd 2abe 2abf 2ac0 "
-               + "2ac1 2ac2 2ac3 2ac4 2ac5 2ac6 2ac7 2ac8 2ac9 2aca 2acb "
-               + "2acc 2acd 2ace 2acf 2ad0 2ad1 2ad2 2ad3 2ad4 2ad5 2ad6 "
-               + "2ad7 2ad8 2ad9 2ada 2adb 2adc 2add 2ade 2adf 2ae0 2ae1 "
-               + "2ae2 2ae3 2ae4 2ae5 2ae6 2ae7 2ae8 2ae9 2aea 2aeb 2aec "
-               + "2aed 2aee 2aef 2af0 2af1 2af2 2af3 2af4 2af5 2af6 2af7 "
-               + "2af8 2af9 2afa 2afb 2afc 2afd 2afe 2aff 2b00 2b01 2b02 "
-               + "2b03 2b04 2b05 2b06 2b07 2b08 2b09 2b0a 2b0b 2b0c 2b0d "
-               + "2b0e 2b0f 2b10 2b11 2b12 2b13 2b14 2b15 2b16 2b17 2b18 "
-               + "2b19 2b1a 2b20 2b21 2b22 2b23 2ce5 2ce6 2ce7 2ce8 2ce9 "
-               + "2cea 2e80 2e81 2e82 2e83 2e84 2e85 2e86 2e87 2e88 2e89 "
-               + "2e8a 2e8b 2e8c 2e8d 2e8e 2e8f 2e90 2e91 2e92 2e93 2e94 "
-               + "2e95 2e96 2e97 2e98 2e99 2e9b 2e9c 2e9d 2e9e 2e9f 2ea0 "
-               + "2ea1 2ea2 2ea3 2ea4 2ea5 2ea6 2ea7 2ea8 2ea9 2eaa 2eab "
-               + "2eac 2ead 2eae 2eaf 2eb0 2eb1 2eb2 2eb3 2eb4 2eb5 2eb6 "
-               + "2eb7 2eb8 2eb9 2eba 2ebb 2ebc 2ebd 2ebe 2ebf 2ec0 2ec1 "
-               + "2ec2 2ec3 2ec4 2ec5 2ec6 2ec7 2ec8 2ec9 2eca 2ecb 2ecc "
-               + "2ecd 2ece 2ecf 2ed0 2ed1 2ed2 2ed3 2ed4 2ed5 2ed6 2ed7 "
-               + "2ed8 2ed9 2eda 2edb 2edc 2edd 2ede 2edf 2ee0 2ee1 2ee2 "
-               + "2ee3 2ee4 2ee5 2ee6 2ee7 2ee8 2ee9 2eea 2eeb 2eec 2eed "
-               + "2eee 2eef 2ef0 2ef1 2ef2 2ef3 2f00 2f01 2f02 2f03 2f04 "
-               + "2f05 2f06 2f07 2f08 2f09 2f0a 2f0b 2f0c 2f0d 2f0e 2f0f "
-               + "2f10 2f11 2f12 2f13 2f14 2f15 2f16 2f17 2f18 2f19 2f1a "
-               + "2f1b 2f1c 2f1d 2f1e 2f1f 2f20 2f21 2f22 2f23 2f24 2f25 "
-               + "2f26 2f27 2f28 2f29 2f2a 2f2b 2f2c 2f2d 2f2e 2f2f 2f30 "
-               + "2f31 2f32 2f33 2f34 2f35 2f36 2f37 2f38 2f39 2f3a 2f3b "
-               + "2f3c 2f3d 2f3e 2f3f 2f40 2f41 2f42 2f43 2f44 2f45 2f46 "
-               + "2f47 2f48 2f49 2f4a 2f4b 2f4c 2f4d 2f4e 2f4f 2f50 2f51 "
-               + "2f52 2f53 2f54 2f55 2f56 2f57 2f58 2f59 2f5a 2f5b 2f5c "
-               + "2f5d 2f5e 2f5f 2f60 2f61 2f62 2f63 2f64 2f65 2f66 2f67 "
-               + "2f68 2f69 2f6a 2f6b 2f6c 2f6d 2f6e 2f6f 2f70 2f71 2f72 "
-               + "2f73 2f74 2f75 2f76 2f77 2f78 2f79 2f7a 2f7b 2f7c 2f7d "
-               + "2f7e 2f7f 2f80 2f81 2f82 2f83 2f84 2f85 2f86 2f87 2f88 "
-               + "2f89 2f8a 2f8b 2f8c 2f8d 2f8e 2f8f 2f90 2f91 2f92 2f93 "
-               + "2f94 2f95 2f96 2f97 2f98 2f99 2f9a 2f9b 2f9c 2f9d 2f9e "
-               + "2f9f 2fa0 2fa1 2fa2 2fa3 2fa4 2fa5 2fa6 2fa7 2fa8 2fa9 "
-               + "2faa 2fab 2fac 2fad 2fae 2faf 2fb0 2fb1 2fb2 2fb3 2fb4 "
-               + "2fb5 2fb6 2fb7 2fb8 2fb9 2fba 2fbb 2fbc 2fbd 2fbe 2fbf "
-               + "2fc0 2fc1 2fc2 2fc3 2fc4 2fc5 2fc6 2fc7 2fc8 2fc9 2fca "
-               + "2fcb 2fcc 2fcd 2fce 2fcf 2fd0 2fd1 2fd2 2fd3 2fd4 2fd5 "
-               + "2ff0 2ff1 2ff2 2ff3 2ff4 2ff5 2ff6 2ff7 2ff8 2ff9 2ffa "
-               + "2ffb 3004 3012 3013 3020 3036 3037 303e 303f 309b 309c "
-               + "3190 3191 3196 3197 3198 3199 319a 319b 319c 319d 319e "
-               + "319f 31c0 31c1 31c2 31c3 31c4 31c5 31c6 31c7 31c8 31c9 "
-               + "31ca 31cb 31cc 31cd 31ce 31cf 3200 3201 3202 3203 3204 "
-               + "3205 3206 3207 3208 3209 320a 320b 320c 320d 320e 320f "
-               + "3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 321a "
-               + "321b 321c 321d 321e 322a 322b 322c 322d 322e 322f 3230 "
-               + "3231 3232 3233 3234 3235 3236 3237 3238 3239 323a 323b "
-               + "323c 323d 323e 323f 3240 3241 3242 3243 3250 3260 3261 "
-               + "3262 3263 3264 3265 3266 3267 3268 3269 326a 326b 326c "
-               + "326d 326e 326f 3270 3271 3272 3273 3274 3275 3276 3277 "
-               + "3278 3279 327a 327b 327c 327d 327e 327f 328a 328b 328c "
-               + "328d 328e 328f 3290 3291 3292 3293 3294 3295 3296 3297 "
-               + "3298 3299 329a 329b 329c 329d 329e 329f 32a0 32a1 32a2 "
-               + "32a3 32a4 32a5 32a6 32a7 32a8 32a9 32aa 32ab 32ac 32ad "
-               + "32ae 32af 32b0 32c0 32c1 32c2 32c3 32c4 32c5 32c6 32c7 "
-               + "32c8 32c9 32ca 32cb 32cc 32cd 32ce 32cf 32d0 32d1 32d2 "
-               + "32d3 32d4 32d5 32d6 32d7 32d8 32d9 32da 32db 32dc 32dd "
-               + "32de 32df 32e0 32e1 32e2 32e3 32e4 32e5 32e6 32e7 32e8 "
-               + "32e9 32ea 32eb 32ec 32ed 32ee 32ef 32f0 32f1 32f2 32f3 "
-               + "32f4 32f5 32f6 32f7 32f8 32f9 32fa 32fb 32fc 32fd 32fe "
-               + "3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 330a "
-               + "330b 330c 330d 330e 330f 3310 3311 3312 3313 3314 3315 "
-               + "3316 3317 3318 3319 331a 331b 331c 331d 331e 331f 3320 "
-               + "3321 3322 3323 3324 3325 3326 3327 3328 3329 332a 332b "
-               + "332c 332d 332e 332f 3330 3331 3332 3333 3334 3335 3336 "
-               + "3337 3338 3339 333a 333b 333c 333d 333e 333f 3340 3341 "
-               + "3342 3343 3344 3345 3346 3347 3348 3349 334a 334b 334c "
-               + "334d 334e 334f 3350 3351 3352 3353 3354 3355 3356 3357 "
-               + "3358 3359 335a 335b 335c 335d 335e 335f 3360 3361 3362 "
-               + "3363 3364 3365 3366 3367 3368 3369 336a 336b 336c 336d "
-               + "336e 336f 3370 3371 3372 3373 3374 3375 3376 3377 3378 "
-               + "3379 337a 337b 337c 337d 337e 337f 3380 3381 3382 3383 "
-               + "3384 3385 3386 3387 3388 3389 338a 338b 338c 338d 338e "
-               + "338f 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 "
-               + "339a 339b 339c 339d 339e 339f 33a0 33a1 33a2 33a3 33a4 "
-               + "33a5 33a6 33a7 33a8 33a9 33aa 33ab 33ac 33ad 33ae 33af "
-               + "33b0 33b1 33b2 33b3 33b4 33b5 33b6 33b7 33b8 33b9 33ba "
-               + "33bb 33bc 33bd 33be 33bf 33c0 33c1 33c2 33c3 33c4 33c5 "
-               + "33c6 33c7 33c8 33c9 33ca 33cb 33cc 33cd 33ce 33cf 33d0 "
-               + "33d1 33d2 33d3 33d4 33d5 33d6 33d7 33d8 33d9 33da 33db "
-               + "33dc 33dd 33de 33df 33e0 33e1 33e2 33e3 33e4 33e5 33e6 "
-               + "33e7 33e8 33e9 33ea 33eb 33ec 33ed 33ee 33ef 33f0 33f1 "
-               + "33f2 33f3 33f4 33f5 33f6 33f7 33f8 33f9 33fa 33fb 33fc "
-               + "33fd 33fe 33ff 4dc0 4dc1 4dc2 4dc3 4dc4 4dc5 4dc6 4dc7 "
-               + "4dc8 4dc9 4dca 4dcb 4dcc 4dcd 4dce 4dcf 4dd0 4dd1 4dd2 "
-               + "4dd3 4dd4 4dd5 4dd6 4dd7 4dd8 4dd9 4dda 4ddb 4ddc 4ddd "
-               + "4dde 4ddf 4de0 4de1 4de2 4de3 4de4 4de5 4de6 4de7 4de8 "
-               + "4de9 4dea 4deb 4dec 4ded 4dee 4def 4df0 4df1 4df2 4df3 "
-               + "4df4 4df5 4df6 4df7 4df8 4df9 4dfa 4dfb 4dfc 4dfd 4dfe "
-               + "4dff a490 a491 a492 a493 a494 a495 a496 a497 a498 a499 "
-               + "a49a a49b a49c a49d a49e a49f a4a0 a4a1 a4a2 a4a3 a4a4 "
-               + "a4a5 a4a6 a4a7 a4a8 a4a9 a4aa a4ab a4ac a4ad a4ae a4af "
-               + "a4b0 a4b1 a4b2 a4b3 a4b4 a4b5 a4b6 a4b7 a4b8 a4b9 a4ba "
-               + "a4bb a4bc a4bd a4be a4bf a4c0 a4c1 a4c2 a4c3 a4c4 a4c5 "
-               + "a4c6 a700 a701 a702 a703 a704 a705 a706 a707 a708 a709 "
-               + "a70a a70b a70c a70d a70e a70f a710 a711 a712 a713 a714 "
-               + "a715 a716 a720 a721 a828 a829 a82a a82b fb29 fdfc fdfd "
-               + "fe62 fe64 fe65 fe66 fe69 ff04 ff0b ff1c ff1d ff1e ff3e "
-               + "ff40 ff5c ff5e ffe0 ffe1 ffe2 ffe3 ffe4 ffe5 ffe6 ffe8 "
-               + "ffe9 ffea ffeb ffec ffed ffee fffc fffd found 3394 chars.";
-
-               string upperChars = "41 42 43 44 45 46 47 48 49 4a 4b 4c 4d "
-               + "4e 4f 50 51 52 53 54 55 56 57 58 59 5a c0 c1 c2 c3 c4 c5 "
-               + "c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d8 d9 "
-               + "da db dc dd de 100 102 104 106 108 10a 10c 10e 110 112 114 "
-               + "116 118 11a 11c 11e 120 122 124 126 128 12a 12c 12e 130 "
-               + "132 134 136 139 13b 13d 13f 141 143 145 147 14a 14c 14e "
-               + "150 152 154 156 158 15a 15c 15e 160 162 164 166 168 16a "
-               + "16c 16e 170 172 174 176 178 179 17b 17d 181 182 184 186 "
-               + "187 189 18a 18b 18e 18f 190 191 193 194 196 197 198 19c "
-               + "19d 19f 1a0 1a2 1a4 1a6 1a7 1a9 1ac 1ae 1af 1b1 1b2 1b3 "
-               + "1b5 1b7 1b8 1bc 1c4 1c7 1ca 1cd 1cf 1d1 1d3 1d5 1d7 1d9 "
-               + "1db 1de 1e0 1e2 1e4 1e6 1e8 1ea 1ec 1ee 1f1 1f4 1f6 1f7 "
-               + "1f8 1fa 1fc 1fe 200 202 204 206 208 20a 20c 20e 210 212 "
-               + "214 216 218 21a 21c 21e 220 222 224 226 228 22a 22c 22e "
-               + "230 232 23a 23b 23d 23e 241 243 244 245 246 248 24a 24c "
-               + "24e 386 388 389 38a 38c 38e 38f 391 392 393 394 395 396 "
-               + "397 398 399 39a 39b 39c 39d 39e 39f 3a0 3a1 3a3 3a4 3a5 "
-               + "3a6 3a7 3a8 3a9 3aa 3ab 3d2 3d3 3d4 3d8 3da 3dc 3de 3e0 "
-               + "3e2 3e4 3e6 3e8 3ea 3ec 3ee 3f4 3f7 3f9 3fa 3fd 3fe 3ff "
-               + "400 401 402 403 404 405 406 407 408 409 40a 40b 40c 40d "
-               + "40e 40f 410 411 412 413 414 415 416 417 418 419 41a 41b "
-               + "41c 41d 41e 41f 420 421 422 423 424 425 426 427 428 429 "
-               + "42a 42b 42c 42d 42e 42f 460 462 464 466 468 46a 46c 46e "
-               + "470 472 474 476 478 47a 47c 47e 480 48a 48c 48e 490 492 "
-               + "494 496 498 49a 49c 49e 4a0 4a2 4a4 4a6 4a8 4aa 4ac 4ae "
-               + "4b0 4b2 4b4 4b6 4b8 4ba 4bc 4be 4c0 4c1 4c3 4c5 4c7 4c9 "
-               + "4cb 4cd 4d0 4d2 4d4 4d6 4d8 4da 4dc 4de 4e0 4e2 4e4 4e6 "
-               + "4e8 4ea 4ec 4ee 4f0 4f2 4f4 4f6 4f8 4fa 4fc 4fe 500 502 "
-               + "504 506 508 50a 50c 50e 510 512 531 532 533 534 535 536 "
-               + "537 538 539 53a 53b 53c 53d 53e 53f 540 541 542 543 544 "
-               + "545 546 547 548 549 54a 54b 54c 54d 54e 54f 550 551 552 "
-               + "553 554 555 556 10a0 10a1 10a2 10a3 10a4 10a5 10a6 10a7 "
-               + "10a8 10a9 10aa 10ab 10ac 10ad 10ae 10af 10b0 10b1 10b2 "
-               + "10b3 10b4 10b5 10b6 10b7 10b8 10b9 10ba 10bb 10bc 10bd "
-               + "10be 10bf 10c0 10c1 10c2 10c3 10c4 10c5 1e00 1e02 1e04 "
-               + "1e06 1e08 1e0a 1e0c 1e0e 1e10 1e12 1e14 1e16 1e18 1e1a "
-               + "1e1c 1e1e 1e20 1e22 1e24 1e26 1e28 1e2a 1e2c 1e2e 1e30 "
-               + "1e32 1e34 1e36 1e38 1e3a 1e3c 1e3e 1e40 1e42 1e44 1e46 "
-               + "1e48 1e4a 1e4c 1e4e 1e50 1e52 1e54 1e56 1e58 1e5a 1e5c "
-               + "1e5e 1e60 1e62 1e64 1e66 1e68 1e6a 1e6c 1e6e 1e70 1e72 "
-               + "1e74 1e76 1e78 1e7a 1e7c 1e7e 1e80 1e82 1e84 1e86 1e88 "
-               + "1e8a 1e8c 1e8e 1e90 1e92 1e94 1ea0 1ea2 1ea4 1ea6 1ea8 "
-               + "1eaa 1eac 1eae 1eb0 1eb2 1eb4 1eb6 1eb8 1eba 1ebc 1ebe "
-               + "1ec0 1ec2 1ec4 1ec6 1ec8 1eca 1ecc 1ece 1ed0 1ed2 1ed4 "
-               + "1ed6 1ed8 1eda 1edc 1ede 1ee0 1ee2 1ee4 1ee6 1ee8 1eea "
-               + "1eec 1eee 1ef0 1ef2 1ef4 1ef6 1ef8 1f08 1f09 1f0a 1f0b "
-               + "1f0c 1f0d 1f0e 1f0f 1f18 1f19 1f1a 1f1b 1f1c 1f1d 1f28 "
-               + "1f29 1f2a 1f2b 1f2c 1f2d 1f2e 1f2f 1f38 1f39 1f3a 1f3b "
-               + "1f3c 1f3d 1f3e 1f3f 1f48 1f49 1f4a 1f4b 1f4c 1f4d 1f59 "
-               + "1f5b 1f5d 1f5f 1f68 1f69 1f6a 1f6b 1f6c 1f6d 1f6e 1f6f "
-               + "1fb8 1fb9 1fba 1fbb 1fc8 1fc9 1fca 1fcb 1fd8 1fd9 1fda "
-               + "1fdb 1fe8 1fe9 1fea 1feb 1fec 1ff8 1ff9 1ffa 1ffb 2102 "
-               + "2107 210b 210c 210d 2110 2111 2112 2115 2119 211a 211b "
-               + "211c 211d 2124 2126 2128 212a 212b 212c 212d 2130 2131 "
-               + "2132 2133 213e 213f 2145 2183 2c00 2c01 2c02 2c03 2c04 "
-               + "2c05 2c06 2c07 2c08 2c09 2c0a 2c0b 2c0c 2c0d 2c0e 2c0f "
-               + "2c10 2c11 2c12 2c13 2c14 2c15 2c16 2c17 2c18 2c19 2c1a "
-               + "2c1b 2c1c 2c1d 2c1e 2c1f 2c20 2c21 2c22 2c23 2c24 2c25 "
-               + "2c26 2c27 2c28 2c29 2c2a 2c2b 2c2c 2c2d 2c2e 2c60 2c62 "
-               + "2c63 2c64 2c67 2c69 2c6b 2c75 2c80 2c82 2c84 2c86 2c88 "
-               + "2c8a 2c8c 2c8e 2c90 2c92 2c94 2c96 2c98 2c9a 2c9c 2c9e "
-               + "2ca0 2ca2 2ca4 2ca6 2ca8 2caa 2cac 2cae 2cb0 2cb2 2cb4 "
-               + "2cb6 2cb8 2cba 2cbc 2cbe 2cc0 2cc2 2cc4 2cc6 2cc8 2cca "
-               + "2ccc 2cce 2cd0 2cd2 2cd4 2cd6 2cd8 2cda 2cdc 2cde 2ce0 "
-               + "2ce2 ff21 ff22 ff23 ff24 ff25 ff26 ff27 ff28 ff29 ff2a "
-               + "ff2b ff2c ff2d ff2e ff2f ff30 ff31 ff32 ff33 ff34 ff35 "
-               + "ff36 ff37 ff38 ff39 ff3a found 836 chars.";
-
-               string whitespaceChars = "9 a b c d 20 85 a0 1680 180e 2000 "
-               + "2001 2002 2003 2004 2005 2006 2007 2008 2009 200a 2028 "
-               + "2029 202f 205f 3000 found 26 chars.";
-#endif
-
                string letters = "";
                string letterOrDigits = "";
        }

diff --git a/mcs/class/corlib/Test/System/DateTimeTest.cs b/mcs/class/corlib/Test/System/DateTimeTest.cs
index 0e3076b1184f41ee557a224b7784f629e241d532..5a45d64493050b13161728a1daeeae89d3b3de51 100644 (file)
--- a/mcs/class/corlib/Test/System/DateTimeTest.cs
+++ b/mcs/class/corlib/Test/System/DateTimeTest.cs
@@ -2528,9 +2528,7 @@ namespace MonoTests.System
                        DateTime expected2 = new DateTime (2011, 03, 22, 08, 32, 00, DateTimeKind.Utc);
 
                        string [] cultures = new string [] {"es-ES", "en-US", "en-GB", "de-DE", "fr-FR"
-#if NET_4_0
                                ,"es", "en", "de", "fr"
-#endif
                                };
                        
                        foreach (string culture in cultures) {

diff --git a/mcs/class/corlib/Test/System/EnumTest.cs b/mcs/class/corlib/Test/System/EnumTest.cs
index c750ee11e3e70280f930dffdd2d4f94a7084748e..0a2173d49fd892f8fd3a5f096050a0be4ab5a351 100644 (file)
--- a/mcs/class/corlib/Test/System/EnumTest.cs
+++ b/mcs/class/corlib/Test/System/EnumTest.cs
@@ -673,7 +673,6 @@ namespace MonoTests.System
                        Assert.AreEqual (TestingEnum3.Test, Enum.Parse (t1.GetType (), "18446744073709551615", false));
                }
 
-#if NET_4_0
                [Test]
                public void TryParseErrors ()
                {
@@ -736,7 +735,6 @@ namespace MonoTests.System
                        Assert.AreEqual (true, success, "#E1");
                        Assert.AreEqual (TestingEnum.Is, result, "#E2");
                }
-#endif
 
                [Test]
                public void ToObject_EnumType_Int32 ()
@@ -1139,7 +1137,6 @@ namespace MonoTests.System
                        negative = -1
                }
 
-#if NET_4_0
                // Our first implementation used to crash
                [Test]
                public void HasFlagTest ()
@@ -1147,7 +1144,6 @@ namespace MonoTests.System
                        Foo f = Foo.negative;
                        bool has = f.HasFlag (Foo.negative);
                }
-#endif
 
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]

diff --git a/mcs/class/corlib/Test/System/EnvironmentCas.cs b/mcs/class/corlib/Test/System/EnvironmentCas.cs
index 4409250fab98220bfdf7fbd4450c1c304675b167..1e730c8857d6f9b9f2fd394a7bbd9756420de4b4 100644 (file)
--- a/mcs/class/corlib/Test/System/EnvironmentCas.cs
+++ b/mcs/class/corlib/Test/System/EnvironmentCas.cs
@@ -110,7 +110,6 @@ namespace MonoCasTests.System {
                        Environment.CurrentDirectory = cd;
                }
 
-#if !RUN_ONDOTNET || NET_4_0 // Disabled because .net 2 fails to load dll with "Failure decoding embedded permission set object" due to "/" path
 
                [Test]
                [FileIOPermission (SecurityAction.Deny, PathDiscovery = "/")]
@@ -129,7 +128,6 @@ namespace MonoCasTests.System {
                        // now that the stack is set, call the method
                        string s = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
                }               
-#endif
 
                [Test]
                public void CurrentDirectory_Set_FileIOPermission ()
@@ -513,4 +511,4 @@ namespace MonoCasTests.System {
        }
 }
 
-#endif
\ No newline at end of file
+#endif

diff --git a/mcs/class/corlib/Test/System/ExceptionCas.cs b/mcs/class/corlib/Test/System/ExceptionCas.cs
index f805e332563a72027dfdd2e170b499cdf3046c6e..82b7566f7003ac41f9c6c959b13764043fa16119 100644 (file)
--- a/mcs/class/corlib/Test/System/ExceptionCas.cs
+++ b/mcs/class/corlib/Test/System/ExceptionCas.cs
@@ -127,7 +127,6 @@ namespace MonoCasTests.System {
                        }
                }
 
-#if !RUN_ONDOTNET || NET_4_0 // Disabled because .net 2 fails to load dll with "Failure decoding embedded permission set object" due to "/" path
 
                [Test]
                [FileIOPermission (SecurityAction.Deny, PathDiscovery = "/")]
@@ -157,6 +156,5 @@ namespace MonoCasTests.System {
                        }
                }
                
-#endif
        }
 }

diff --git a/mcs/class/corlib/Test/System/GuidTest.cs b/mcs/class/corlib/Test/System/GuidTest.cs
index 463d54a9b5e65b398b76a83dba112c9a830d7f7c..697ebb79062e15c8400e2a0c2a6423b3aa36452f 100644 (file)
--- a/mcs/class/corlib/Test/System/GuidTest.cs
+++ b/mcs/class/corlib/Test/System/GuidTest.cs
@@ -294,20 +294,10 @@ namespace MonoTests.System {
                        Assert.AreEqual ("00010203-0405-0607-0809-0a0b0c0d0e0f", g.ToString (""), "A6");
                        Assert.AreEqual ("00010203-0405-0607-0809-0a0b0c0d0e0f", g.ToString ((string)null), "A7");
                        Assert.AreEqual ("{00010203-0405-0607-0809-0a0b0c0d0e0f}", g.ToString ("B", null), "A10");
-#if NET_4_0
                        Assert.AreEqual ("{0x00010203,0x0405,0x0607,{0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}}", g.ToString ("x"), "A11");
                        Assert.AreEqual ("{0x00010203,0x0405,0x0607,{0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}}", g.ToString ("X"), "A11");
-#endif
                }
 
-#if !NET_4_0
-               [Test]
-               [ExpectedException (typeof (FormatException))]
-               public void ToString_UnsupportedFormat ()
-               {
-                       new Guid (0x00010203, 0x0405, 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f).ToString ("X");
-               }
-#endif
 
                [Test]
                [ExpectedException (typeof (FormatException))]
@@ -351,7 +341,6 @@ namespace MonoTests.System {
                        new Guid ("{0x00010203,0x0405,0x0607,{0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}}aaaa");
                }
 
-#if NET_4_0
 
                /*
                        N = new Guid ("000102030405060708090a0b0c0d0e0f"); 
@@ -445,6 +434,5 @@ namespace MonoTests.System {
                        Assert.IsFalse (Guid.TryParseExact("foobar", null, out guid), "A5");
                        Assert.AreEqual (Guid.Empty, guid, "A6");
                }
-#endif
        }
 }

diff --git a/mcs/class/corlib/Test/System/StringTest.cs b/mcs/class/corlib/Test/System/StringTest.cs
index 74570292985d0e3c02e90e5d03a21dd4521dbb03..293479eb851d41f9a6c6a9e89f083f3743b88257 100644 (file)
--- a/mcs/class/corlib/Test/System/StringTest.cs
+++ b/mcs/class/corlib/Test/System/StringTest.cs
@@ -3769,9 +3769,7 @@ public class StringTest
                Assert.AreEqual ("original", "\u2028original\u2029".Trim (), "net_2_0 additional char#1");
                Assert.AreEqual ("original", "\u0085original\u1680".Trim (), "net_2_0 additional char#2");
 
-#if NET_4_0
                Assert.AreEqual ("", "\x9\xa\xb\xc\xd\x20\x85\xa0\x1680\x2000\x2001\x2002\x2003\x2004\x2005\x2006\x2007\x2008\x2009\x200a\x2028\x2029\x202f\x205f\x3000".Trim (), "net_4_0 changes #1");
-#endif
        }
 
        [Test]
@@ -3944,9 +3942,7 @@ public class StringTest
                chunks = s1.Split(c2, 0);
                Assert.AreEqual (0, chunks.Length, "Zero split");
 
-#if NET_4_0
                Assert.AreEqual (0, "\x9\xa\xb\xc\xd\x20\x85\xa0\x1680\x2000\x2001\x2002\x2003\x2004\x2005\x2006\x2007\x2008\x2009\x200a\x2028\x2029\x202f\x205f\x3000".Split ((char[]) null, StringSplitOptions.RemoveEmptyEntries).Length, "net_4_0 changes");
-#endif
        }
 
        [Test]

diff --git a/mcs/class/corlib/Test/System/TimeSpanTest.cs b/mcs/class/corlib/Test/System/TimeSpanTest.cs
index bab1c5f36e988207cebe4eaf9702dd28f9155ceb..feb0224fbd70f90c8ff9d6ad0001406b3814d0f7 100644 (file)
--- a/mcs/class/corlib/Test/System/TimeSpanTest.cs
+++ b/mcs/class/corlib/Test/System/TimeSpanTest.cs
@@ -638,14 +638,10 @@ public class TimeSpanTest {
                ParseHelper (" 13:45:15 ",false, false, "13:45:15");
                ParseHelper (" -1:2:3 ", false, false, "-01:02:03");
 
-#if NET_4_0
                // In 4.0 when the first part is out of range, it parses it as day.
                ParseHelper (" 25:11:12 ", false, false, "25.11:12:00");
                ParseHelper (" 24:11:12 ", false, false, "24.11:12:00");
                ParseHelper (" 23:11:12 ", false, false, "23:11:12");
-#else
-               ParseHelper (" 25:0:0 ",false, true, "dontcare");
-#endif
 
                ParseHelper ("-21.23:59:59.9999999", false, false, "-21.23:59:59.9999999");
                ParseHelper ("10:12  ", false, false, "10:12:00");
@@ -655,14 +651,9 @@ public class TimeSpanTest {
                ParseHelper ("24:60:60", false, true, "dontcare");
                ParseHelper ("0001:0002:0003.12     ", false, false, "01:02:03.1200000");
 
-#if NET_4_0
                // In 4.0 when a section has more than 7 digits an OverflowException is thrown.
                ParseHelper (" 1:2:3:12345678 ", false, true, "dontcare");
-#else
-               ParseHelper (" 1:2:3:12345678 ", true, false, "dontcare"); 
-#endif
 
-#if NET_4_0
                ParseHelper ("10:11:12:13", false, false, "10.11:12:13"); // Days using : instead of . as separator
                ParseHelper ("10.11", true, false, "dontcare"); // days+hours is invalid
 
@@ -679,7 +670,6 @@ public class TimeSpanTest {
                        // restore culture
                        Thread.CurrentThread.CurrentCulture = prev_culture;
                }
-#endif
 
                ParseHelper ("00:00:00", false, false, "00:00:00");
                ParseHelper ("00:10:00", false, false, "00:10:00");
@@ -740,19 +730,11 @@ public class TimeSpanTest {
        {
                // hours should be between 0 and 23 but format is also invalid (too many dots)
                // In 2.0 overflow as precedence over format, but not in 4.0
-#if NET_4_0
                try {
                        TimeSpan.Parse ("0.99.99.0");
                        Assert.Fail ("#A1");
                } catch (FormatException) {
                }
-#else
-               try {
-                       TimeSpan.Parse ("0.99.99.0");
-                       Assert.Fail ("#A1");
-               } catch (OverflowException) {
-               }
-#endif
                try {
                        TimeSpan.Parse ("0.999999999999.99.0");
                        Assert.Fail ("#A2");
@@ -820,12 +802,7 @@ public class TimeSpanTest {
                Assert.AreEqual (false, TimeSpan.TryParse ("100000000000000.1:1:1", out result), "#E1");
                Assert.AreEqual (false, TimeSpan.TryParse ("24:60:60", out result), "#E2");
 
-#if NET_4_0
-               Assert.AreEqual (true, TimeSpan.TryParse ("0001:0002:0003.12     ", out result), "#F1");
-#else
                Assert.AreEqual (true, TimeSpan.TryParse ("0001:0002:0003.12     ", out result), "#F1");
-               Assert.AreEqual ("01:02:03.1200000", result.ToString (), "#F2");
-#endif
 
                Assert.AreEqual (false, TimeSpan.TryParse (" 1:2:3:12345678 ", out result), "#G1");
 
@@ -835,7 +812,6 @@ public class TimeSpanTest {
                Assert.AreEqual (true, TimeSpan.TryParse ("-10675199.02:48:05.4775808", out result), "MinValue#1");
                Assert.AreEqual (TimeSpan.MinValue, result, "MinValue#2");
 
-#if NET_4_0
                // Force the use of french culture -which is using a non common NumberDecimalSeparator-
                // as current culture, to show that the Parse method is *actually* being culture sensitive
                CultureInfo french_culture = CultureInfo.GetCultureInfo ("fr-FR");
@@ -849,7 +825,6 @@ public class TimeSpanTest {
                        // restore culture
                        Thread.CurrentThread.CurrentCulture = prev_culture;
                }
-#endif
        }
 
        [Test]
@@ -862,7 +837,6 @@ public class TimeSpanTest {
                Assert.AreEqual (false, TimeSpan.TryParse ("-10675199.02:48:05.4775809", out result), "UnderMinValue");
        }
 
-#if NET_4_0
        [Test]
        public void TryParseOverloads ()
        { 
@@ -1341,7 +1315,6 @@ public class TimeSpanTest {
                {
                }
        }
-#endif
 }
 
 }

diff --git a/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs b/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs
index 42f0a3ec4521dfa6e5bb9a21c5d330e17c4f1d3e..003cea8ddfe9d5348b3e2a36ebf1f543b3f6c2dc 100644 (file)
--- a/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs
+++ b/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs
@@ -451,11 +451,7 @@ namespace MonoTests.System
                                DateTime utc = DateTime.UtcNow;
                                Assert.AreEqual(utc.Kind, DateTimeKind.Utc);
                                DateTime converted = TimeZoneInfo.ConvertTimeFromUtc(utc, TimeZoneInfo.Local);
-                       #if NET_4_0
                                Assert.AreEqual(DateTimeKind.Local, converted.Kind);
-                       #else
-                               Assert.AreEqual(DateTimeKind.Unspecified, converted.Kind);
-                       #endif
                                DateTime back = TimeZoneInfo.ConvertTimeToUtc(converted, TimeZoneInfo.Local);
                                Assert.AreEqual(back.Kind, DateTimeKind.Utc);
                                Assert.AreEqual(utc, back);

diff --git a/mcs/class/corlib/Test/System/TupleTest.cs b/mcs/class/corlib/Test/System/TupleTest.cs
index cf410e785547f1f5f4b1bff593a903bf9e7df7b6..2372267a5c8f100cb5b88e892643a7d80d019715 100644 (file)
--- a/mcs/class/corlib/Test/System/TupleTest.cs
+++ b/mcs/class/corlib/Test/System/TupleTest.cs
@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System;
 using NUnit.Framework;
@@ -60,4 +59,3 @@ namespace MonoTests.System
        }
 }
 
-#endif
\ No newline at end of file

diff --git a/mcs/class/corlib/Test/System/TypeTest.cs b/mcs/class/corlib/Test/System/TypeTest.cs
index 9f87bcd74d19a29f1b4e41b2d7171f2c1af2835c..0b550c046a0e30c7f5d5858c2be372a1c4e5dc4e 100644 (file)
--- a/mcs/class/corlib/Test/System/TypeTest.cs
+++ b/mcs/class/corlib/Test/System/TypeTest.cs
@@ -3487,7 +3487,6 @@ namespace MonoTests.System
                        Assert.AreSame (typeof (Foo<>), type.DeclaringType, "#1");
                }
 
-#if NET_4_0
                interface IGetInterfaceMap<in T>
                {
                    string Bar (T t);
@@ -4044,7 +4043,6 @@ namespace MonoTests.System
                public void IsAssignableFromWithNullable () {
             Console.WriteLine(typeof(IEnumerable<int?>).IsAssignableFrom(typeof(IEnumerable<int>)));
                }
-#endif
 
                [Test]
                public void GetTypeParseGenericCorrectly () { //Bug #15124

diff --git a/mcs/class/corlib/Test/System/VersionTest.cs b/mcs/class/corlib/Test/System/VersionTest.cs
index ff7b152e2b56153091428070b6b89174e7145907..f74822fdbf8b34cfaed76592e0f0ba5e2ead857d 100644 (file)
--- a/mcs/class/corlib/Test/System/VersionTest.cs
+++ b/mcs/class/corlib/Test/System/VersionTest.cs
@@ -249,7 +249,6 @@ namespace MonoTests.System
                        Assert.AreEqual (1, v1235.CompareTo (v1234), "1235-1234");
                }
 
-#if NET_4_0
                [Test]
                public void Parse ()
                {
@@ -359,6 +358,5 @@ namespace MonoTests.System
                        Assert.AreEqual (null, result, "#L1");
                        Assert.AreEqual (false, success, "#L2");
                }
-#endif
        }
 }

diff --git a/mcs/mcs/assign.cs b/mcs/mcs/assign.cs
index 5650d054c2be3607cc0ec91a1b40c9271f06c0fa..04cfe49f1f867158e76a486138ba87982f9a1762 100644 (file)
--- a/mcs/mcs/assign.cs
+++ b/mcs/mcs/assign.cs
@@ -363,7 +363,6 @@ namespace Mono.CSharp {
                        return this;
                }
 
-#if NET_4_0 || MOBILE_DYNAMIC
                public override System.Linq.Expressions.Expression MakeExpression (BuilderContext ctx)
                {
                        var tassign = target as IDynamicAssign;
@@ -391,7 +390,6 @@ namespace Mono.CSharp {
 
                        return System.Linq.Expressions.Expression.Assign (target_object, source_object);
                }
-#endif
                protected virtual Expression ResolveConversions (ResolveContext ec)
                {
                        source = Convert.ImplicitConversionRequired (ec, source, target.Type, source.Location);

diff --git a/mcs/mcs/dynamic.cs b/mcs/mcs/dynamic.cs
index 4eb2dabcf515c23ed6b256303e0d595a23d1f5eb..3b2a5b4b18d0e428c7cb476a25ea823569d39930 100644 (file)
--- a/mcs/mcs/dynamic.cs
+++ b/mcs/mcs/dynamic.cs
@@ -60,14 +60,6 @@ namespace Mono.CSharp
        //
        public class RuntimeValueExpression : Expression, IDynamicAssign, IMemoryLocation
        {
-#if !NET_4_0 && !MOBILE_DYNAMIC
-               public class DynamicMetaObject
-               {
-                       public TypeSpec RuntimeType;
-                       public TypeSpec LimitType;
-                       public SLE.Expression Expression;
-               }
-#endif
 
                readonly DynamicMetaObject obj;
 
@@ -143,7 +135,6 @@ namespace Mono.CSharp
                        return base.MakeExpression (ctx);
 #else
 
-#if NET_4_0 || MOBILE_DYNAMIC
                                if (type.IsStruct && !obj.Expression.Type.IsValueType)
                                        return SLE.Expression.Unbox (obj.Expression, type.GetMetaInfo ());
 
@@ -151,7 +142,6 @@ namespace Mono.CSharp
                                        if (((SLE.ParameterExpression) obj.Expression).IsByRef)
                                                return obj.Expression;
                                }
-       #endif
 
                                return SLE.Expression.Convert (obj.Expression, type.GetMetaInfo ());
 #endif
@@ -178,7 +168,6 @@ namespace Mono.CSharp
                        return this;
                }
 
-#if NET_4_0 || MOBILE_DYNAMIC
                public override SLE.Expression MakeExpression (BuilderContext ctx)
                {
 #if STATIC
@@ -187,7 +176,6 @@ namespace Mono.CSharp
                        return SLE.Expression.Block (expr.MakeExpression (ctx), SLE.Expression.Default (type.GetMetaInfo ()));
 #endif
                }
-#endif
        }
 
        #endregion

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index 1eac539b9c8bf8d477f7e1d3533ff896db986242..36b70ad47b254199193ec0ca033054fb3426f8ab 100644 (file)
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -1416,14 +1416,12 @@ namespace Mono.CSharp
                }
 
 
-#if NET_4_0 || MOBILE_DYNAMIC
                public override SLE.Expression MakeExpression (BuilderContext ctx)
                {
                        var target = ((RuntimeValueExpression) expr).MetaObject.Expression;
                        var source = SLE.Expression.Convert (operation.MakeExpression (ctx), target.Type);
                        return SLE.Expression.Assign (target, source);
                }
-#endif
 
                public static string OperName (Mode oper)
                {
@@ -2699,7 +2697,7 @@ namespace Mono.CSharp
                        temp_storage.Release (ec);
                }
 
-#if (NET_4_0 || MOBILE_DYNAMIC) && !STATIC
+#if !STATIC
                public override SLE.Expression MakeExpression (BuilderContext ctx)
                {
                        return SLE.Expression.Default (type.GetMetaInfo ());
@@ -8299,7 +8297,6 @@ namespace Mono.CSharp
                        return data;
                }
 
-#if NET_4_0 || MOBILE_DYNAMIC
                public override SLE.Expression MakeExpression (BuilderContext ctx)
                {
 #if STATIC
@@ -8316,7 +8313,6 @@ namespace Mono.CSharp
                        return SLE.Expression.NewArrayInit (array_element_type.GetMetaInfo (), initializers);
 #endif
                }
-#endif
 #if STATIC
                //
                // Emits the initializers for the array
@@ -10807,13 +10803,9 @@ namespace Mono.CSharp
 #else
                        var value = new[] { source.MakeExpression (ctx) };
                        var args = Arguments.MakeExpression (arguments, ctx).Concat (value);
-#if NET_4_0 || MOBILE_DYNAMIC
                        return SLE.Expression.Block (
                                        SLE.Expression.Call (InstanceExpression.MakeExpression (ctx), (MethodInfo) Setter.GetMetaInfo (), args),
                                        value [0]);
-#else
-                       return args.First ();
-#endif
 #endif
                }
 

diff --git a/mcs/tests/gtest-284.cs b/mcs/tests/gtest-284.cs
index fbab6410132587107ca8841ebb7ee4013f93ca60..b7583e37813a0e482413450bae0be5f30df488f9 100644 (file)
--- a/mcs/tests/gtest-284.cs
+++ b/mcs/tests/gtest-284.cs
@@ -172,10 +172,8 @@ public static class InterfaceTester
                ifaces.Add (icollection_type, State.Missing);
                ifaces.Add (ienumerable_type, State.Missing);
                ifaces.Add (icloneable_type, State.Missing);
-#if NET_4_0
                ifaces.Add (typeof (IStructuralEquatable), State.Missing);
                ifaces.Add (typeof (IStructuralComparable), State.Missing);
-#endif
                Type array_type = t.MakeArrayType ();
 
                if (Debug) {