X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FTest%2FSystem.Text%2FEncoderTest.cs;h=9295b99d50ffb604f2744cfc23ebf15853600d6a;hb=bf5947a0fd2b523c30833605ee69b2b041aa43f4;hp=5dc13e1a813db820f9aa4c4718ad16eeb9b4b166;hpb=a097b5471761180c4aae2dab224ed9caeeae3e86;p=mono.git

diff --git a/mcs/class/corlib/Test/System.Text/EncoderTest.cs b/mcs/class/corlib/Test/System.Text/EncoderTest.cs
index 5dc13e1a813..9295b99d50f 100644
--- a/mcs/class/corlib/Test/System.Text/EncoderTest.cs
+++ b/mcs/class/corlib/Test/System.Text/EncoderTest.cs
@@ -15,7 +15,6 @@ namespace MonoTests.System.Text
 	[TestFixture]
 	public class EncoderTest
 	{
-#if NET_2_0
 		[Test]
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void ConvertNullChars ()
@@ -44,7 +43,7 @@ namespace MonoTests.System.Text
 			byte [] bytes = new byte [10000];
 			char [] chars = new char [10000];
 
-			Encoder conv = Encoding.UTF8.GetEncoder ();
+			Encoder conv = new ExposedEncoder ();
 			int bytesUsed, charsUsed;
 			bool done;
 
@@ -55,6 +54,93 @@ namespace MonoTests.System.Text
 			Assert.AreEqual (625, bytesUsed, "#2");
 			Assert.AreEqual (625, charsUsed, "#3");
 		}
-#endif
+
+		[Test]
+		public void ConvertLimitedDestinationUTF8 ()
+		{
+			byte [] bytes = new byte [10000];
+			char [] chars = new char [10000];
+
+			Encoder conv = Encoding.UTF8.GetEncoder ();
+			var type = conv.GetType ();
+			int bytesUsed, charsUsed;
+			bool done;
+
+			conv.Convert (chars, 0, 10000, bytes, 0, 1000, true,
+				      out bytesUsed, out charsUsed, out done);
+
+			Assert.IsFalse (done, "#1");
+			Assert.AreEqual (1000, bytesUsed, "#2");
+			Assert.AreEqual (1000, charsUsed, "#3");
+		}
+
+		[Test]
+		public void CustomEncodingGetEncoder ()
+		{
+			var encoding = new CustomEncoding ();
+			var encoder = encoding.GetEncoder ();
+			Assert.IsNotNull (encoder);
+		}
+
+		[Test]
+		public void ConvertZeroCharacters ()
+		{
+			int charsUsed, bytesUsed;
+			bool completed;
+			byte [] bytes = new byte [0];
+
+			Encoding.UTF8.GetEncoder ().Convert (
+				new char[0], 0, 0, bytes, 0, bytes.Length, true,
+				out charsUsed, out bytesUsed, out completed);
+
+			Assert.IsTrue (completed, "#1");
+			Assert.AreEqual (0, charsUsed, "#2");
+			Assert.AreEqual (0, bytesUsed, "#3");
+		}
+
+		class ExposedEncoder : Encoder {
+			public override int GetByteCount (char [] chars, int index, int count, bool flush)
+			{
+				return Encoding.UTF8.GetEncoder ().GetByteCount (chars, index, count, flush);
+			}
+
+			public override int GetBytes (char [] chars, int charIndex, int charCount, byte [] bytes, int byteIndex, bool flush)
+			{
+				return Encoding.UTF8.GetEncoder ().GetBytes (chars, charIndex, charCount, bytes, byteIndex, flush);
+			}
+		}
+
+		class CustomEncoding : Encoding {
+
+			public override int GetByteCount (char [] chars, int index, int count)
+			{
+				throw new NotSupportedException ();
+			}
+
+			public override int GetBytes (char [] chars, int charIndex, int charCount, byte [] bytes, int byteIndex)
+			{
+				throw new NotSupportedException ();
+			}
+
+			public override int GetCharCount (byte [] bytes, int index, int count)
+			{
+				throw new NotSupportedException ();
+			}
+
+			public override int GetChars (byte [] bytes, int byteIndex, int byteCount, char [] chars, int charIndex)
+			{
+				throw new NotSupportedException ();
+			}
+
+			public override int GetMaxByteCount (int charCount)
+			{
+				throw new NotSupportedException ();
+			}
+
+			public override int GetMaxCharCount (int byteCount)
+			{
+				throw new NotSupportedException ();
+			}
+		}
 	}
 }