1.1 test fixes

svn path=/trunk/mcs/; revision=140213

diff --cc mcs/class/System.Web/Makefile
index f5a5d9a3904c2feb8a2336476d11f9079412204a,f5a5d9a3904c2feb8a2336476d11f9079412204a..af8857dc5e576e623b586f7b3c4957da4e8b1cfe
--- 1/mcs/class/System.Web/Makefile
--- 2/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@@ -76,7 -76,7 +76,6 @@@ RESOURCE_FILES_2 = 
  OTHER_RES = $(RESOURCE_FILES_1)
  TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax \
--      Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax.cs \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx \

diff --cc mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
index d424109d37e5327355b68c06140370ab399e14a0,d424109d37e5327355b68c06140370ab399e14a0..b29dc60746dbec632a3b9168989e657e97f1646b
--- 1/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
--- 2/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
@@@ -749,8 -749,8 +749,15 @@@ namespace System.Web.Compilatio
                                return type;
                        }
  
++#if NET_2_0
                        Parse ();
--
++#else
++                      try {
++                              Parse ();
++                      } catch (ParseException ex) {
++                              throw new HttpException ("Compilation failed.", ex);
++                      }
++#endif
                        BaseCompiler compiler = GetCompilerFromType ();
                        
                        type = compiler.GetCompiledType ();

diff --cc mcs/class/System.Web/System.Web_test.dll.sources
index 32637f2cdbd8460b0ba2cf43f06928a7a06b774a,32637f2cdbd8460b0ba2cf43f06928a7a06b774a..c28a26b87ab01ed95787ae6ce1688febcff46d2b
--- 1/mcs/class/System.Web/System.Web_test.dll.sources
--- 2/mcs/class/System.Web/System.Web_test.dll.sources
+++ b/mcs/class/System.Web/System.Web_test.dll.sources
@@@ -20,6 -20,6 +20,7 @@@ mainsoft/NunitWeb/NunitWeb/BaseWorkerRe
  mainsoft/NunitWeb/NunitWeb/CustomSection.cs
  mainsoft/NunitWeb/NunitWeb/FakeMembershipProvider.cs
  mainsoft/NunitWeb/NunitWeb/FormRequest.cs
++mainsoft/NunitWeb/NunitWeb/Global.asax.cs
  mainsoft/NunitWeb/NunitWeb/IForeignData.cs
  mainsoft/NunitWeb/NunitWeb/HandlerInvoker.cs
  mainsoft/NunitWeb/NunitWeb/MyHandler.cs

diff --cc mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs
index 4b8a6b99ebd118b2b028b4da7d7d9cc2289d2f05,4b8a6b99ebd118b2b028b4da7d7d9cc2289d2f05..8d4b331560e9abd9d2eeb71d83d0f772e3f653ad
--- 1/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs
--- 2/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs
@@@ -214,15 -214,15 +214,15 @@@ namespace MonoTests.System.Web.Compilat
                        string originalHtml = "<a href=\"test\">bla</a>";
                        HtmlDiff.AssertAreEqual (originalHtml, renderedHtml, "#A1");
                }
--#endif
  
--              [Test (Description="Bug #525104")]
++              [Test (Description="Bug #524358")]
                [ExpectedException (typeof (HttpException))]
                public void DuplicateControlsInClientComment ()
                {
                        // Just test if it throws an exception
--                      new WebTest ("DuplicateControlsInClientCommment.aspx").Run ();
++                      new WebTest ("DuplicateControlsInClientComment.aspx").Run ();
                }
++#endif
                
                [Test (Description="Bug #517656")]
                public void ServerControlInClientSideComment ()

diff --cc mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Global.asax.cs
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..bd7092871bb757d322b9d740b787b95bfef0e7b9
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Global.asax.cs
@@@ -1,0 -1,0 +1,22 @@@
++using System;\r
++\r
++namespace MainsoftWebApp\r
++{\r
++      public partial class Global : System.Web.HttpApplication\r
++      {\r
++#if NET_2_0\r
++              protected void Application_Error (object sender, EventArgs e)\r
++              {\r
++                      // Code that runs when an unhandled error occurs\r
++                      Exception objErr = Server.GetLastError ().GetBaseException ();\r
++                      MonoTests.SystemWeb.Framework.WebTest.RegisterException (objErr);\r
++                      Server.ClearError ();\r
++              }\r
++\r
++              protected void Application_OnEndRequest (object sender, EventArgs e) {\r
++                      // Ensure the headers are sent\r
++                      MonoTests.SystemWeb.Framework.WebTest.CurrentTest.SendHeaders ();\r
++              }\r
++#endif\r
++      }\r
++}\r

diff --cc mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax
index bb6b26b484f97e73acd1ca53f6159392713ab3b2,bb6b26b484f97e73acd1ca53f6159392713ab3b2..ab0dba324411a130edb999a8bd5a758e54360c60
--- 1/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax
--- 2/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax
@@@ -1,1 -1,1 +1,1 @@@
--<%@ Application Language="C#" Inherits="MainsoftWebApp20.Global" CodeFile="Global.asax.cs" %>\r
++<%@ Application Language="C#" Inherits="MainsoftWebApp.Global" %>

diff --cc mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax.cs
index 9ef7daa90b31687ee8c1b122aacffc017793e1e1,9ef7daa90b31687ee8c1b122aacffc017793e1e1..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax.cs
--- 2/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax.cs
+++ /dev/null
@@@ -1,20 -1,20 +1,0 @@@
--using System;\r
--\r
--namespace MainsoftWebApp20\r
--{\r
--      public partial class Global : System.Web.HttpApplication\r
--      {\r
--              protected void Application_Error (object sender, EventArgs e)\r
--              {\r
--                      // Code that runs when an unhandled error occurs\r
--                      Exception objErr = Server.GetLastError ().GetBaseException ();\r
--                      MonoTests.SystemWeb.Framework.WebTest.RegisterException (objErr);\r
--                      Server.ClearError ();\r
--              }\r
--\r
--              protected void Application_OnEndRequest (object sender, EventArgs e) {\r
--                      // Ensure the headers are sent\r
--                      MonoTests.SystemWeb.Framework.WebTest.CurrentTest.SendHeaders ();\r
--              }\r
--      }\r
--}\r