Merge pull request #1237 from esdrubal/xdocument

[mono.git] / mcs / class / corlib / Test / System / ConsoleTest.cs

diff --git a/mcs/class/corlib/Test/System/ConsoleTest.cs b/mcs/class/corlib/Test/System/ConsoleTest.cs
index 5653d19c68b47bc9e53e41aafbaec529dd02f7a9..1d9f1a10bc689454df138a2256dc41e9c338aaa8 100644 (file)
--- 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
 {
@@ -321,8 +321,39 @@ public class ConsoleTest
        [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
 }
 }