Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b

mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs

@@ -230,7 +230,7 @@ namespace MonoTests.System.Web.Compilation {
 			string originalHtml = @"<!--[if IE 6]>
 		<link rel=""styleheet"" type=""text/css"" href=""~/compat-ie6.css""></link>
 	<![endif]-->";
-			HtmlDiff.AssertAreEqual (originalHtml, renderedHtml, "#A1");
+			HtmlDiff.AssertAreEqual (originalHtml.Replace ("\r\n","\n"), renderedHtml, "#A1");
 		}
 		
 		[Test (Description="Bug #400807")]
@@ -286,7 +286,7 @@ namespace MonoTests.System.Web.Compilation {
 			string originalHtml = @"<!-- comment start
   <input id=""testBox"" type=""checkbox"" name=""testBox"" />
 comment end -->";
-			HtmlDiff.AssertAreEqual (originalHtml, renderedHtml, "#A1");
+			HtmlDiff.AssertAreEqual (originalHtml.Replace ("\r\n","\n"), renderedHtml, "#A1");
 		}
 
 		[Test]

mcs/class/System.Web/Test/System.Web.Hosting/HostingEnvironmentTest.cs

@@ -77,13 +77,13 @@ namespace MonoTests.System.Web.Hosting {
 			Assert.IsNull (HostingEnvironment.InitializationException, "During:InitializationException");
 			Assert.IsTrue (HostingEnvironment.IsHosted, "During:IsHosted");
 			Assert.IsNotNull (HostingEnvironment.ApplicationID, "During:ApplicationID:Null");
-			Assert.IsNotEmpty (HostingEnvironment.ApplicationID, "During:ApplicationID:Empty");
+			AssertHelper.IsNotEmpty (HostingEnvironment.ApplicationID, "During:ApplicationID:Empty");
 			Assert.IsNotNull (HostingEnvironment.ApplicationPhysicalPath, "During:ApplicationPhysicalPath:Null");
-			Assert.IsNotEmpty (HostingEnvironment.ApplicationPhysicalPath, "During:ApplicationPhysicalPath:Empty");
+			AssertHelper.IsNotEmpty (HostingEnvironment.ApplicationPhysicalPath, "During:ApplicationPhysicalPath:Empty");
 			Assert.IsNotNull (HostingEnvironment.ApplicationVirtualPath, "During:ApplicationVirtualPath:Null");
-			Assert.IsNotEmpty (HostingEnvironment.ApplicationVirtualPath, "During:ApplicationVirtualPath:Empty");
+			AssertHelper.IsNotEmpty (HostingEnvironment.ApplicationVirtualPath, "During:ApplicationVirtualPath:Empty");
 			Assert.IsNotNull (HostingEnvironment.SiteName, "During:SiteName:Null");
-			Assert.IsNotEmpty (HostingEnvironment.SiteName, "During:SiteName:Empty");
+			AssertHelper.IsNotEmpty (HostingEnvironment.SiteName, "During:SiteName:Empty");
 			Assert.IsNotNull (HostingEnvironment.Cache, "During:Cache");
 			Assert.AreEqual (ApplicationShutdownReason.None, HostingEnvironment.ShutdownReason, "During:ShutdownReason");
 			Assert.IsNotNull (HostingEnvironment.VirtualPathProvider, "During:VirtualPathProvider");

mcs/class/System.Web/Test/System.Web.UI.WebControls.Adapters/HideDisabledControlAdapterTest.cs

@@ -57,7 +57,7 @@ namespace MonoTests.System.Web.UI.WebControls.Adapters
 			sw = new StringWriter();
 			w = new HtmlTextWriter(sw);
 			a.Render (w);
-			Assert.AreEqual ("RenderBeginTag\nRenderContents\nRenderEndTag\n", sw.ToString(), "Render #1");
+			Assert.AreEqual ("RenderBeginTag\nRenderContents\nRenderEndTag\n", sw.ToString().Replace ("\r", ""), "Render #1");
 			
 			
 			sw = new StringWriter();

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

@@ -91,21 +91,21 @@ namespace MonoTests.System.Web.UI.WebControls.Adapters
 		public void RenderBeginTag ()
 		{
 			a.RenderBeginTag (w);
-			Assert.AreEqual ("RenderBeginTag\n", sw.ToString (), "RenderBeginTag #1");
+			Assert.AreEqual ("RenderBeginTag\n", sw.ToString ().Replace ("\r", ""), "RenderBeginTag #1");
 		}
 
 		[Test]
 		public void RenderContentsTag ()
 		{
 			a.RenderContents (w);
-			Assert.AreEqual ("RenderContents\n", sw.ToString (), "RenderContents #1");
+			Assert.AreEqual ("RenderContents\n", sw.ToString ().Replace ("\r", ""), "RenderContents #1");
 		}
 
 		[Test]
 		public void RenderEndTag ()
 		{
 			a.RenderEndTag (w);
-			Assert.AreEqual ("RenderEndTag\n", sw.ToString (), "RenderEndTag #1");
+			Assert.AreEqual ("RenderEndTag\n", sw.ToString ().Replace ("\r", ""), "RenderEndTag #1");
 		}
 
 		[Test]

mcs/class/System.Web/Test/System.Web.UI.WebControls.Adapters/WebControlAdapterTest.cs

@@ -63,28 +63,28 @@ namespace MonoTests.System.Web.UI.WebControls.Adapters
 		public void RenderBeginTag ()
 		{
 			a.RenderBeginTag (w);
-			Assert.AreEqual ("RenderBeginTag\n", sw.ToString (), "RenderBeginTag #1");
+			Assert.AreEqual ("RenderBeginTag\n", sw.ToString ().Replace ("\r", ""), "RenderBeginTag #1");
 		}
 
 		[Test]
 		public void RenderContentsTag ()
 		{
 			a.RenderContents (w);
-			Assert.AreEqual ("RenderContents\n", sw.ToString (), "RenderContents #1");
+			Assert.AreEqual ("RenderContents\n", sw.ToString ().Replace ("\r", ""), "RenderContents #1");
 		}
 
 		[Test]
 		public void RenderEndTag ()
 		{
 			a.RenderEndTag (w);
-			Assert.AreEqual ("RenderEndTag\n", sw.ToString (), "RenderEndTag #1");
+			Assert.AreEqual ("RenderEndTag\n", sw.ToString ().Replace ("\r", ""), "RenderEndTag #1");
 		}
 
 		[Test]
 		public void Render ()
 		{
 			a.Render (w);
-			Assert.AreEqual ("RenderBeginTag\nRenderContents\nRenderEndTag\n", sw.ToString (), "Render #1");
+			Assert.AreEqual ("RenderBeginTag\nRenderContents\nRenderEndTag\n", sw.ToString ().Replace ("\r", ""), "Render #1");
 		}
 		
 		[Test]

mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.4.0.cs.REMOVED.git-id

@@ -1 +1 @@
-a3772412270d2034fc106168a237dd41420adfa9
+64aa7ad1b5a33e952dcb1afafb94208f77a1a2e8

mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardTest.cs

@@ -1538,7 +1538,7 @@ namespace MonoTests.System.Web.UI.WebControls
 			Console.WriteLine ("----------------------------");
 			Console.WriteLine (renderedHtml);
 			
-			Assert.AreEqual (origHtml, renderedHtml, "#A1");
+			Assert.AreEqual (origHtml.Replace ("\r", ""), renderedHtml.Replace ("\r", ""), "#A1");
 		}
 
 		[Test]
@@ -1566,13 +1566,13 @@ namespace MonoTests.System.Web.UI.WebControls
 			string origHtml = "Header<table cellspacing=\"5\" cellpadding=\"5\">\r\n\t<tr>\r\n\t\t<td align=\"right\"><input type=\"submit\" name=\"MyWizard$StepNavigationTemplateContainerID$StepPreviousButton\" value=\"Previous\" id=\"MyWizard_StepNavigationTemplateContainerID_StepPreviousButton\" /></td><td align=\"right\"><input type=\"submit\" name=\"MyWizard$StepNavigationTemplateContainerID$StepNextButton\" value=\"Next\" id=\"MyWizard_StepNavigationTemplateContainerID_StepNextButton\" /></td>\n\t</tr>\n</table>Step";
 			string renderedHtml = HtmlDiff.GetControlFromPageHtml (result);
 
-			Assert.AreEqual (origHtml, renderedHtml, "#A1");
+			Assert.AreEqual (origHtml.Replace ("\r", ""), renderedHtml.Replace ("\r", ""), "#A1");
 
 			t.UserData = "RenderHeader_InSpan";
 			result = t.Run ();
 			origHtml = "Header<table cellspacing=\"5\" cellpadding=\"5\">\r\n\t<tr>\r\n\t\t<td align=\"right\"><input type=\"submit\" name=\"MyWizard$StepNavigationTemplateContainerID$StepPreviousButton\" value=\"Previous\" id=\"MyWizard_StepNavigationTemplateContainerID_StepPreviousButton\" /></td><td align=\"right\"><input type=\"submit\" name=\"MyWizard$StepNavigationTemplateContainerID$StepNextButton\" value=\"Next\" id=\"MyWizard_StepNavigationTemplateContainerID_StepNextButton\" /></td>\n\t</tr>\n</table>Step";
 			renderedHtml = HtmlDiff.GetControlFromPageHtml (result);
-			Assert.AreEqual (origHtml, renderedHtml, "#A2");
+			Assert.AreEqual (origHtml.Replace ("\r", ""), renderedHtml.Replace ("\r", ""), "#A2");
 		}
 
 		[Test]

mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs

@@ -547,7 +547,7 @@ namespace MonoTests.System.Web {
 
 			KnownResponseHeader known;
 
-			Assert.LessOrEqual (1, f.KnownResponseHeaders.Count, "#B1");
+			AssertHelper.LessOrEqual (1, f.KnownResponseHeaders.Count, "#B1");
 
 			known = (KnownResponseHeader)f.KnownResponseHeaders ["Content-Type"];
 			Assert.AreEqual (HttpWorkerRequest.HeaderContentType, known.Index, "#B2");
@@ -571,7 +571,7 @@ namespace MonoTests.System.Web {
 
 			KnownResponseHeader known;
 
-			Assert.LessOrEqual (1, f.KnownResponseHeaders.Count, "#B1");
+			AssertHelper.LessOrEqual (1, f.KnownResponseHeaders.Count, "#B1");
 
 			known = (KnownResponseHeader)f.KnownResponseHeaders ["Content-Type"];
 			Assert.AreEqual (HttpWorkerRequest.HeaderContentType, known.Index, "#B2");

mcs/class/System.Web/Test/System.Web/HttpRuntimeTest.cs

@@ -55,7 +55,6 @@ namespace MonoTests.System.Web
 		[Test]
 		[Category ("NunitWeb")]
 		[Ignore ("Pending fix for bug 351878")]
-		[Explicit]
 		public void UnloadAppDomain100Times () 
 		{
 			for (int i = 0; i < 100; i++)

mcs/class/System.Web/Test/System.Web/XmlSiteMapProviderTest.cs

@@ -148,7 +148,7 @@ namespace MonoTests.System.Web
 			provider.DoAddNode (node, rootNode);
 
 			Assert.IsNotNull (provider.CallTrace, "#A1");
-			Assert.Greater (provider.CallTrace.Length, 1, "#A1-1");
+			AssertHelper.Greater (provider.CallTrace.Length, 1, "#A1-1");
 			Assert.AreEqual (provider.CallTrace[0].Name, "BuildSiteMap", "#A1-2");
 		}
 
@@ -247,7 +247,7 @@ namespace MonoTests.System.Web
 			Assert.IsNotNull (provider.RootNode, "#A1");
 			Assert.AreEqual (provider.RootNode.Provider, provider, "#A2");
 			Assert.IsNotNull (provider.CallTrace, "#A3");
-			Assert.Greater (provider.CallTrace.Length, 1, "#A3-1");
+			AssertHelper.Greater (provider.CallTrace.Length, 1, "#A3-1");
 			Assert.AreEqual ("BuildSiteMap", provider.CallTrace[0].Name, "#A3-2");
 			Assert.AreEqual ("get_RootNode", provider.CallTrace[1].Name, "#A3-3");
 		}