mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.3.2.467

Browse Source 
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/System.Web/Test/System.Web.Caching/FileResponseElementTest.cs
View File

@@ -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

2
mcs/class/System.Web/Test/System.Web.Caching/HeaderElementTest.cs
View File

@@ -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

2
mcs/class/System.Web/Test/System.Web.Caching/MemoryResponseElementTest.cs
View File

@@ -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

16
mcs/class/System.Web/Test/System.Web.Caching/OutputCacheTest.cs
View File

File diff suppressed because one or more lines are too long

2
mcs/class/System.Web/Test/System.Web.Caching/SqlCacheDependencyTest.cs
View File

@@ -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
}
}

2
mcs/class/System.Web/Test/System.Web.Caching/SubstitutionResponseElementTest.cs
View File

@@ -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

2
mcs/class/System.Web/Test/System.Web.Compilation/BuildManagerTest.cs
View File

@@ -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
}
}

2
mcs/class/System.Web/Test/System.Web.Compilation/BuildProviderTest.cs
View File

@@ -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

2
mcs/class/System.Web/Test/System.Web.Compilation/RouteUrlExpressionBuilderTest.cs
View File

@@ -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

12
mcs/class/System.Web/Test/System.Web.Configuration/MachineKeySectionTest.cs
View File

@@ -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
}
}

20
mcs/class/System.Web/Test/System.Web.Configuration/MachineKeyValidationConverterTest.cs
View File

@@ -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 ();

2
mcs/class/System.Web/Test/System.Web.Security/MachineKeyTest.cs
View File

@@ -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

4
mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlFormTest.cs
View File

@@ -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");
}

5
mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputButtonTest.cs
View File

@@ -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);

2
mcs/class/System.Web/Test/System.Web.UI.WebControls.Adapters/MenuAdapterTest.cs
View File

@@ -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 ();

2
mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseDataBoundControlTest.cs
View File

@@ -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
}
}

2
mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseDataListTest.cs
View File

@@ -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
}
}

12
mcs/class/System.Web/Test/System.Web.UI.WebControls/BoundFieldTest.cs
View File

@@ -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]

2
mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs
View File

@@ -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 ()
{

20
mcs/class/System.Web/Test/System.Web.UI.WebControls/CheckBoxFieldTest.cs
View File

@@ -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);

Some files were not shown because too many files have changed in this diff Show More