* ObjectStateFormatter.cs: Avoid NRE in Serialize. Fixes bug #81851.

* LosFormatterTest.cs: Added tests for LosFormatter.
* System.Web_test.dll.sources: Added LosFormatterTest.cs.

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

mcs/class/System.Web/ChangeLog

@@ -1,3 +1,7 @@
+2007-06-15  Gert Driesen  <[email protected]>
+
+	* System.Web_test.dll.sources: Added LosFormatterTest.cs.
+
 2007-06-12  Vladimir Krasnov  <[email protected]>
 	
 	* System.Web20.csproj: added CompilationSection.cs

mcs/class/System.Web/System.Web.UI/ChangeLog

@@ -1,3 +1,7 @@
+2007-06-15  Gert Driesen  <[email protected]>
+
+	* ObjectStateFormatter.cs: Avoid NRE in Serialize. Fixes bug #81851.
+
 2007-06-09  Marek Habersack  <[email protected]>
 
 	* TemplateControl.cs: make sure TemplateControl is set to the

mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs

@@ -177,7 +177,7 @@ namespace System.Web.UI {
 			MemoryStream ms = new MemoryStream ();
 			Stream output = ms;
 #if NET_2_0
-			bool needEncryption = page.NeedViewStateEncryption;
+			bool needEncryption = page == null ? false : page.NeedViewStateEncryption;
 			if (needEncryption){
 				output = new CryptoStream (output, page.GetCryptoTransform (CryptoStreamMode.Write), CryptoStreamMode.Write);
 			}

mcs/class/System.Web/System.Web_test.dll.sources

@@ -355,6 +355,7 @@ System.Web.UI/HtmlTextWriterCas.cs
 System.Web.UI/ImageClickEventArgsCas.cs
 System.Web.UI/LiteralControlCas.cs
 System.Web.UI/LosFormatterCas.cs
+System.Web.UI/LosFormatterTest.cs
 System.Web.UI/ObjectConverterCas.cs
 System.Web.UI/ObjectTagBuilderCas.cs
 System.Web.UI/PageCas.cs

mcs/class/System.Web/Test/System.Web.UI/ChangeLog

@@ -1,3 +1,7 @@
+2007-06-15  Gert Driesen  <[email protected]>
+
+	* LosFormatterTest.cs: Added tests for LosFormatter.
+
 2007-06-09  Marek Habersack  <[email protected]>
 
 	* ControlTest.cs: enabled two tests that hadn't been working

mcs/class/System.Web/Test/System.Web.UI/LosFormatterTest.cs

@@ -0,0 +1,150 @@
+//
+// LosFormatterTest.cs - Unit tests for System.Web.UI.LosFormatter
+//
+// Author:
+//	Gert Driesen  <[email protected]>
+//
+// Copyright (C) 2007 Gert Driesen
+//
+// 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.IO;
+using System.Text;
+using System.Web.UI;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Web.UI
+{
+	[TestFixture]
+	public class LosFormatterTest
+	{
+		[Test] // bug #81851
+		public void Serialize ()
+		{
+			string s = "Hello world";
+			LosFormatter lf = new LosFormatter ();
+			StringWriter sw = new StringWriter ();
+			lf.Serialize (sw, s);
+			string s1 = sw.ToString ();
+			Assert.IsNotNull (s1, "#1");
+			string s2 = lf.Deserialize (s1) as string;
+			Assert.IsNotNull (s2, "#2");
+			Assert.AreEqual (s, s2, "#3");
+		}
+
+		[Test]
+		[Category ("NotWorking")]
+		public void Serialize_Output ()
+		{
+			string s = "Hello world";
+			LosFormatter lf = new LosFormatter ();
+			StringWriter sw = new StringWriter ();
+			lf.Serialize (sw, s);
+			string s1 = sw.ToString ();
+#if NET_2_0
+			Assert.AreEqual ("/wEFC0hlbGxvIHdvcmxk", s1, "#1");
+#else
+			Assert.AreEqual ("SGVsbG8gd29ybGQ=", s1, "#1");
+#endif
+			string s2 = lf.Deserialize (s1) as string;
+			Assert.IsNotNull (s2, "#2");
+			Assert.AreEqual (s, s2, "#3");
+		}
+
+		[Test]
+		[Category ("NotDotNet")] // MS throws NullReferenceException
+		public void Serialize_Output_Null ()
+		{
+			LosFormatter lf = new LosFormatter ();
+			try {
+				lf.Serialize ((TextWriter) null, "test");
+				Assert.Fail ("#1");
+			} catch (ArgumentNullException ex) {
+				Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.IsNotNull (ex.ParamName, "#5");
+				Assert.AreEqual ("output", ex.ParamName, "#6");
+			}
+		}
+
+		[Test]
+		[Category ("NotWorking")]
+		public void Serialize_Stream ()
+		{
+			string s = "Hello world";
+			LosFormatter lf = new LosFormatter ();
+			MemoryStream ms = new MemoryStream ();
+			lf.Serialize (ms, s);
+			string s1 = Encoding.UTF8.GetString (ms.GetBuffer (), 0, (int) ms.Length);
+#if NET_2_0
+			Assert.AreEqual ("/wEFC0hlbGxvIHdvcmxk", s1, "#1");
+#else
+			Assert.AreEqual ("SGVsbG8gd29ybGQ=", s1, "#1");
+#endif
+			string s2 = lf.Deserialize (s1) as string;
+			Assert.IsNotNull (s2, "#2");
+			Assert.AreEqual (s, s2, "#3");
+		}
+
+		[Test]
+		public void Serialize_Stream_Null ()
+		{
+			LosFormatter lf = new LosFormatter ();
+			try {
+				lf.Serialize ((Stream) null, "test");
+				Assert.Fail ("#1");
+			} catch (ArgumentNullException ex) {
+				Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.IsNotNull (ex.ParamName, "#5");
+				Assert.AreEqual ("stream", ex.ParamName, "#6");
+			}
+		}
+
+		[Test]
+		[Category ("NotWorking")]
+		public void Serialize_Value_Null ()
+		{
+			LosFormatter lf = new LosFormatter ();
+			MemoryStream ms = new MemoryStream ();
+			lf.Serialize (ms, null);
+			string s1 = Encoding.UTF8.GetString (ms.GetBuffer (), 0, (int) ms.Length);
+#if NET_2_0
+			Assert.AreEqual ("/wFk", s1, "#1");
+#else
+			Assert.AreEqual (string.Empty, s1, "#1");
+#endif
+
+			StringWriter sw = new StringWriter ();
+			lf.Serialize (sw, null);
+			string s2 = sw.ToString ();
+#if NET_2_0
+			Assert.AreEqual ("/wFk", s1, "#2");
+#else
+			Assert.AreEqual (string.Empty, s1, "#2");
+#endif
+		}
+	}
+}