1 files changed, 30 insertions, 15 deletions

diff --git a/IRCTokens/Tests/Tokenization.cs b/IRCTokens/Tests/Tokenization.cs
index 03959de..c4c5c5a 100644
--- a/IRCTokens/Tests/Tokenization.cs
+++ b/IRCTokens/Tests/Tokenization.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IRCTokens.Tests
@@ -7,98 +9,98 @@ namespace IRCTokens.Tests
     public class Tokenization
     {
         [TestMethod]
-        public void TestTagsMissing()
+        public void TagsMissing()
         {
             var line = new Line("PRIVMSG #channel");
             Assert.IsNull(line.Tags);
         }
 
         [TestMethod]
-        public void TestTagsMissingValue()
+        public void TagsMissingValue()
         {
             var line = new Line("@id= PRIVMSG #channel");
             Assert.AreEqual(string.Empty, line.Tags["id"]);
         }
 
         [TestMethod]
-        public void TestTagsMissingEqual()
+        public void TagsMissingEqual()
         {
             var line = new Line("@id PRIVMSG #channel");
             Assert.AreEqual(string.Empty, line.Tags["id"]);
         }
 
         [TestMethod]
-        public void TestTagsUnescape()
+        public void TagsUnescape()
         {
             var line = new Line(@"@id=1\\\:\r\n\s2 PRIVMSG #channel");
             Assert.AreEqual("1\\;\r\n 2", line.Tags["id"]);
         }
 
         [TestMethod]
-        public void TestTagsOverlap()
+        public void TagsOverlap()
         {
             var line = new Line(@"@id=1\\\s\\s PRIVMSG #channel");
             Assert.AreEqual("1\\ \\s", line.Tags["id"]);
         }
 
         [TestMethod]
-        public void TestTagsLoneEndSlash()
+        public void TagsLoneEndSlash()
         {
             var line = new Line("@id=1\\ PRIVMSG #channel");
             Assert.AreEqual("1", line.Tags["id"]);
         }
 
         [TestMethod]
-        public void TestSourceWithoutTags()
+        public void SourceWithoutTags()
         {
             var line = new Line(":nick!user@host PRIVMSG #channel");
             Assert.AreEqual("nick!user@host", line.Source);
         }
 
         [TestMethod]
-        public void TestSourceWithTags()
+        public void SourceWithTags()
         {
             var line = new Line("@id=123 :nick!user@host PRIVMSG #channel");
             Assert.AreEqual("nick!user@host", line.Source);
         }
 
         [TestMethod]
-        public void TestSourceMissingWithoutTags()
+        public void SourceMissingWithoutTags()
         {
             var line = new Line("PRIVMSG #channel");
             Assert.IsNull(line.Source);
         }
 
         [TestMethod]
-        public void TestSourceMissingWithTags()
+        public void SourceMissingWithTags()
         {
             var line = new Line("@id=123 PRIVMSG #channel");
             Assert.IsNull(line.Source);
         }
 
         [TestMethod]
-        public void TestCommand()
+        public void Command()
         {
             var line = new Line("privmsg #channel");
             Assert.AreEqual("PRIVMSG", line.Command);
         }
 
         [TestMethod]
-        public void TestParamsTrailing()
+        public void ParamsTrailing()
         {
             var line = new Line("PRIVMSG #channel :hello world");
             CollectionAssert.AreEqual(new List<string> {"#channel", "hello world"}, line.Params);
         }
 
         [TestMethod]
-        public void TestParamsOnlyTrailing()
+        public void ParamsOnlyTrailing()
         {
             var line = new Line("PRIVMSG :hello world");
             CollectionAssert.AreEqual(new List<string> {"hello world"}, line.Params);
         }
 
         [TestMethod]
-        public void TestParamsMissing()
+        public void ParamsMissing()
         {
             var line = new Line("PRIVMSG");
             Assert.AreEqual("PRIVMSG", line.Command);
@@ -106,7 +108,7 @@ namespace IRCTokens.Tests
         }
 
         [TestMethod]
-        public void TestAllTokens()
+        public void AllTokens()
         {
             var line = new Line("@id=123 :nick!user@host PRIVMSG #channel :hello world");
             CollectionAssert.AreEqual(new Dictionary<string, string> {{"id", "123"}}, line.Tags);
@@ -114,5 +116,18 @@ namespace IRCTokens.Tests
             Assert.AreEqual("PRIVMSG", line.Command);
             CollectionAssert.AreEqual(new List<string> {"#channel", "hello world"}, line.Params);
         }
+
+        [TestMethod]
+        public void NulByte()
+        {
+            var decoder = new IRCTokens.StatefulDecoder();
+            var bytes = Encoding.UTF8.GetBytes(":nick!user@host PRIVMSG #channel :hello")
+                .Concat(Encoding.UTF8.GetBytes("\0"))
+                .Concat(Encoding.UTF8.GetBytes("world"))
+                .ToArray();
+            var line = decoder.Push(bytes, bytes.Length).First();
+            
+            CollectionAssert.AreEqual(new List<string> {"#channel", "hello"}, line.Params);
+        }
     }
 }