X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FTest%2FSystem%2FConsoleTest.cs;h=1d9f1a10bc689454df138a2256dc41e9c338aaa8;hb=b2d61a33a63e06a128d482c29e861452b26759bf;hp=902d626d67d8588dbac6bd8006b0e3b9db451ac9;hpb=0443306d611d0830e27327e1f0a3ef3457dfa535;p=mono.git

diff --git a/mcs/class/corlib/Test/System/ConsoleTest.cs b/mcs/class/corlib/Test/System/ConsoleTest.cs
index 902d626d67d..1d9f1a10bc6 100644
--- a/mcs/class/corlib/Test/System/ConsoleTest.cs
+++ b/mcs/class/corlib/Test/System/ConsoleTest.cs
@@ -8,7 +8,7 @@
 using NUnit.Framework;
 using System;
 using System.IO;
-
+using System.Text;
 
 namespace MonoTests.System
 {
@@ -223,6 +223,12 @@ public class ConsoleTest
 			Assert.AreEqual (testStr, line, "Wrong line");
 		}
 	}
+	
+	[Test]
+	public void TestWrite_Params()
+	{
+		Console.Write ("text {0}", (object[]) null);
+	}
 
 	[Test]
 	public void TestWrite()
@@ -311,6 +317,43 @@ public class ConsoleTest
 		// TODO - Likewise for char[], decimal, double, int, long, object, single, uint32, uint64
 		// TODO - write with format string
 	}
+	
+	[Test]
+	public void TestWriteLine_Params()
+	{
+		Stream s = new MemoryStream();
+		TextWriter w = new StreamWriter(s);
+		((StreamWriter)w).AutoFlush = true;
+		TextReader r = new StreamReader(s);
+		Console.SetOut(w);
 
+		Console.WriteLine ("text {0}", (object[]) null);
+	}
+
+#if !MOBILE
+
+#if NET_4_5
+	[Test]
+	public void RedirectedTest ()
+	{
+		if (Console.IsErrorRedirected) {
+			Assert.Ignore ("The error output stream of the console is redirected.");
+		}
+
+		Console.SetError (TextWriter.Null);
+		Assert.IsFalse (Console.IsErrorRedirected);
+	}
+#endif
+
+	// Bug 678357
+	[Test]
+	public void EncodingTest ()
+	{
+		Console.OutputEncoding = Encoding.ASCII;
+		Assert.AreEqual (Console.OutputEncoding, Console.Out.Encoding);
+		Console.OutputEncoding = Encoding.UTF8;
+		Assert.AreEqual (Console.OutputEncoding, Console.Out.Encoding);
+	}
+#endif
 }
 }