Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions

View File

@ -816,11 +816,7 @@ namespace MonoTests.System.Web.UI
public static void ResolveUrl_Load (Page p)
{
#if TARGET_JVM
string appPath = "/MainsoftWebApp20";
#else
string appPath = "/NunitWeb";
#endif
Control ctrl = new Control ();
p.Controls.Add (ctrl);
Assert.AreEqual (appPath + "/MyPage.aspx", ctrl.ResolveUrl ("~/MyPage.aspx"), "ResolveClientUrl Failed");
@ -866,11 +862,7 @@ namespace MonoTests.System.Web.UI
public static void ResolveUrl2_Load (Page p)
{
#if TARGET_JVM
string appPath = "/MainsoftWebApp20";
#else
string appPath = "/NunitWeb";
#endif
Control uc = p.FindControl ("WebUserControl1");
Control ctrl = uc.FindControl ("Label");