update attachments, fixed filter formats, added some documentation, made constructors initializable only by factory functions

10 files changed, 133 insertions, 69 deletions

diff --git a/SendGrid/Example/Example.csproj b/SendGrid/Example/Example.csproj
index 776c740..cb778d1 100755
--- a/SendGrid/Example/Example.csproj
+++ b/SendGrid/Example/Example.csproj
@@ -57,7 +57,9 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <None Include="app.config" />

+    <None Include="app.config">

+      <SubType>Designer</SubType>

+    </None>

   </ItemGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/SendGrid/Example/RESTAPI.cs b/SendGrid/Example/RESTAPI.cs
index a80c536..f02ea3f 100755
--- a/SendGrid/Example/RESTAPI.cs
+++ b/SendGrid/Example/RESTAPI.cs
@@ -30,7 +30,7 @@ namespace Example
         public void SimpleHTMLEmail()

         {

             //create a new message object

-            var message = new SendGrid(new Header());

+            var message = SendGrid.GenerateInstance();

 

             //set the message recipients

 

@@ -84,7 +84,7 @@ namespace Example
             //Utils.PrepareAttachments();

 

             //create an instance of the SMTP transport mechanism

-            var restInstance = new REST(new NetworkCredential(_username, _password));

+            var restInstance = REST.GetInstance(new NetworkCredential(_username, _password));

 

             //send the mail

             restInstance.Deliver(message);

diff --git a/SendGrid/Example/SMTPAPI.cs b/SendGrid/Example/SMTPAPI.cs
index 6ed10cb..2ee8927 100755
--- a/SendGrid/Example/SMTPAPI.cs
+++ b/SendGrid/Example/SMTPAPI.cs
@@ -25,7 +25,7 @@ namespace Example
         public void SimpleHTMLEmail()

         {

             //create a new message object

-            var message = new SendGrid(new Header());

+            var message = SendGrid.GenerateInstance();

 

             //set the message recipients

             foreach(string recipient in _to)

@@ -52,7 +52,7 @@ namespace Example
         public void SimplePlaintextEmail()

         {

             //create a new message object

-            var message = new SendGrid(new Header());

+            var message = SendGrid.GenerateInstance();

 

             //set the message recipients

             foreach(string recipient in _to)

@@ -80,7 +80,7 @@ namespace Example
         {

             var header = new Header();

             //create a new message object

-            var message = new SendGrid(header);

+            var message = SendGrid.GenerateInstance();

 

             //set the message recipients

             foreach (string recipient in _to)

@@ -114,7 +114,7 @@ namespace Example
         {

             var header = new Header();

             //create a new message object

-            var message = new SendGrid(header);

+            var message = SendGrid.GenerateInstance();

 

             //set the message recipients

             foreach (string recipient in _to)

diff --git a/SendGrid/Example/app.config b/SendGrid/Example/app.config
index cb2586b..e212038 100755
--- a/SendGrid/Example/app.config
+++ b/SendGrid/Example/app.config
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>

 <configuration>

-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>

+</configuration>

diff --git a/SendGrid/SendGridMail/ISendGrid.cs b/SendGrid/SendGridMail/ISendGrid.cs
index c73cd99..81952d3 100755
--- a/SendGrid/SendGridMail/ISendGrid.cs
+++ b/SendGrid/SendGridMail/ISendGrid.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;

 using System.IO;

 using System.Linq;

+using System.Net;

 using System.Net.Mail;

 using System.Net.Mime;

 using System.Text;

@@ -171,6 +172,6 @@ namespace SendGridMail
         void EnableBypassListManagement();

         #endregion

 

-        void Mail();

+        void Mail(NetworkCredential credentials);

     }

 }

diff --git a/SendGrid/SendGridMail/SendGrid.cs b/SendGrid/SendGridMail/SendGrid.cs
index b1a38aa..0804099 100755
--- a/SendGrid/SendGridMail/SendGrid.cs
+++ b/SendGrid/SendGridMail/SendGrid.cs
@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Globalization;

 using System.IO;

 using System.Linq;

+using System.Net;

 using System.Net.Mail;

 using System.Net.Mime;

 using System.Runtime.InteropServices.ComTypes;

 using System.Text;

+using SendGridMail.Transport;

 

 namespace SendGridMail

 {

@@ -26,31 +28,39 @@ namespace SendGridMail
         private const String ReHtml = @"<\%\s*[^\s]+\s*\%>";

         #endregion

 

-        public void InitializeFilters()

+        #region Initialization and Constructors

+        /// <summary>

+        /// Creates an instance of SendGrid's custom message object

+        /// </summary>

+        /// <returns></returns>

+        public static SendGrid GenerateInstance()

         {

-            this._filters = 

-            new Dictionary<string, string>

-            {

-                {"Gravatar", "gravatar"},

-                {"OpenTracking", "opentrack"},

-                {"ClickTracking", "clicktrack"},

-                {"SpamCheck", "spamcheck"},

-                {"Unsubscribe", "subscriptiontrack"},

-                {"Footer", "footer"},

-                {"GoogleAnalytics", "ganalytics"},

-                {"Template", "template"},

-                {"Bcc", "bcc"},

-                {"BypassListManagement", "bypass_list_management"}

-            };

+            var header = new Header();

+            return new SendGrid(header);

         }

 

-        public SendGrid(MailAddress from, MailAddress[] to, MailAddress[] cc, MailAddress[] bcc, 

-            String subject, String html, String text, TransportType transport, IHeader header = null )

+        /// <summary>

+        /// Creates an instance of SendGrid's custom message object with mail parameters

+        /// </summary>

+        /// <param name="from">The email address of the sender</param>

+        /// <param name="to">An array of the recipients</param>

+        /// <param name="cc">Supported over SMTP, with future plans for support in the REST transport</param>

+        /// <param name="bcc">Blind recipients</param>

+        /// <param name="subject">The subject of the message</param>

+        /// <param name="html">the html content for the message</param>

+        /// <param name="text">the plain text part of the message</param>

+        /// <param name="transport">Transport class to use for sending the message</param>

+        /// <returns></returns>

+        public static SendGrid GenerateInstance(MailAddress from, MailAddress[] to, MailAddress[] cc, MailAddress[] bcc,

+                                                String subject, String html, String text, TransportType transport)

         {

-            message = new MailMessage();

-            Header = header;

-            Headers = new Dictionary<string, string>();

+            var header = new Header();

+            return new SendGrid(from, to, cc, bcc, subject, html, text, transport, header);

+        }

 

+        internal SendGrid(MailAddress from, MailAddress[] to, MailAddress[] cc, MailAddress[] bcc, 

+            String subject, String html, String text, TransportType transport, IHeader header = null ) : this(header)

+        {

             From = from;

             To = to;

             Cc = cc;

@@ -62,7 +72,7 @@ namespace SendGridMail
             Html = html;

         }

 

-        public SendGrid(IHeader header)

+        internal SendGrid(IHeader header)

         {

             message = new MailMessage();

             Header = header;

@@ -72,6 +82,25 @@ namespace SendGridMail
             this.InitializeFilters();

         }

 

+        public void InitializeFilters()

+        {

+            this._filters =

+            new Dictionary<string, string>

+            {

+                {"Gravatar", "gravatar"},

+                {"OpenTracking", "opentrack"},

+                {"ClickTracking", "clicktrack"},

+                {"SpamCheck", "spamcheck"},

+                {"Unsubscribe", "subscriptiontrack"},

+                {"Footer", "footer"},

+                {"GoogleAnalytics", "ganalytics"},

+                {"Template", "template"},

+                {"Bcc", "bcc"},

+                {"BypassListManagement", "bypass_list_management"}

+            };

+        }

+        #endregion

+

         #region Properties

         public MailAddress From

         {

@@ -456,6 +485,9 @@ namespace SendGridMail
 

             Headers.Keys.ToList().ForEach(k => message.Headers.Add(k, Headers[k]));

 

+            message.Attachments.Clear();

+            message.AlternateViews.Clear();

+

             if(Attachments != null)

             {

                 foreach (Attachment attachment in Attachments)

@@ -465,7 +497,7 @@ namespace SendGridMail
             }

 

             if (Text != null)

-            { // Encoding.GetEncoding(charset)

+            {

                 AlternateView plainView = AlternateView.CreateAlternateViewFromString(Text, null, "text/plain");

                 message.AlternateViews.Add(plainView);

             }

@@ -482,12 +514,36 @@ namespace SendGridMail
             return message;

         }

 

-        public void Mail()

+        /// <summary>

+        /// Helper function lets us look at the mime before it is sent

+        /// </summary>

+        /// <param name="directory">directory in which we store this mime message</param>

+        internal void SaveMessage(String directory)

         {

-            SmtpClient client = new SmtpClient("localhost");

-            client.DeliveryMethod = SmtpDeliveryMethod.SpecifiedPickupDirectory;

-            client.PickupDirectoryLocation = @"C:\temp";

-            client.Send(message);

+            var client = new SmtpClient("localhost")

+                             {

+                                 DeliveryMethod = SmtpDeliveryMethod.SpecifiedPickupDirectory,

+                                 PickupDirectoryLocation = @"C:\temp"

+                             };

+            var msg = CreateMimeMessage();

+            client.Send(msg);

+        }

+

+        public void Mail(NetworkCredential credentials)

+        {

+            ITransport transport;

+            switch (Transport)

+            {

+                case TransportType.SMTP:

+                    transport = SMTP.GenerateInstance(credentials);

+                    break;

+                case TransportType.REST:

+                    transport = REST.GetInstance(credentials);

+                    break;

+                default:

+                    throw new ArgumentException("Transport method not specified");

+            }

+            transport.Deliver(this);

         }

     }

 }

diff --git a/SendGrid/SendGridMail/Transport/REST.cs b/SendGrid/SendGridMail/Transport/REST.cs
index 3a77c3f..1ee7c74 100755
--- a/SendGrid/SendGridMail/Transport/REST.cs
+++ b/SendGrid/SendGridMail/Transport/REST.cs
@@ -23,7 +23,12 @@ namespace SendGridMail.Transport
         private readonly String _restEndpoint;

         private readonly String _format;

 

-        public REST(NetworkCredential credentials, String url = Endpoint)

+        public static REST GetInstance(NetworkCredential credentials, String url = Endpoint)

+        {

+            return new REST(credentials, url);

+        }

+

+        internal REST(NetworkCredential credentials, String url = Endpoint)

         {

             _query = new List<KeyValuePair<string, string>>();

             _queryParameters = HttpUtility.ParseQueryString(String.Empty);

@@ -74,6 +79,7 @@ namespace SendGridMail.Transport
             Console.WriteLine("DONE!");

 

             var request = (HttpWebRequest)WebRequest.Create(restCommand.AbsoluteUri);

+            request.Method = "POST";

             var response = (HttpWebResponse)request.GetResponse();

 

             // Basically, read the entire message out before we parse the XML.

diff --git a/SendGrid/Tests/TestHeader.cs b/SendGrid/Tests/TestHeader.cs
index 76025aa..9ccb3d6 100755
--- a/SendGrid/Tests/TestHeader.cs
+++ b/SendGrid/Tests/TestHeader.cs
@@ -18,7 +18,7 @@ namespace Tests
             var test = new Header();

             test.AddSubVal("foo", new List<string>{"bar", "raz"});

             var result = test.AsJson();

-            Assert.AreEqual("{\"data\" : {\"sub\" : {\"foo\" : [\"bar\", \"raz\"]}}}", result);            

+            Assert.AreEqual("{\"sub\" : {\"foo\" : [\"bar\", \"raz\"]}}", result);            

         }

 

         [Test]

@@ -27,7 +27,7 @@ namespace Tests
             var test = new Header();

             test.AddUniqueIdentifier(new Dictionary<string, string>(){{"foo", "bar"}});

             var result = test.AsJson();

-            Assert.AreEqual("{\"data\" : {\"unique_args\" : {\"foo\" : \"bar\"}}}", result);

+            Assert.AreEqual("{\"unique_args\" : {\"foo\" : \"bar\"}}", result);

         }

 

         [Test]

@@ -36,7 +36,7 @@ namespace Tests
             var test = new Header();

             test.SetCategory("foo");

             var result = test.AsJson();

-            Assert.AreEqual("{\"data\" : {\"category\" : \"foo\"}}", result);

+            Assert.AreEqual("{\"category\" : \"foo\"}", result);

         }

 

         [Test]

@@ -45,7 +45,7 @@ namespace Tests
             var test = new Header();

             test.Enable("foo");

             var result = test.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"foo\" : {\"settings\" : {\"enable\" : \"1\"}}}}}", result); 

+            Assert.AreEqual("{\"filters\" : {\"foo\" : {\"settings\" : {\"enable\" : \"1\"}}}}", result); 

         }

 

         [Test]

@@ -54,7 +54,7 @@ namespace Tests
             var test = new Header();

             test.Disable("foo");

             var result = test.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"foo\" : {\"settings\" : {\"enable\" : \"0\"}}}}}", result);

+            Assert.AreEqual("{\"filters\" : {\"foo\" : {\"settings\" : {\"enable\" : \"0\"}}}}", result);

         }

 

         [Test]

@@ -63,7 +63,7 @@ namespace Tests
             var test = new Header();

             test.AddFilterSetting("foo", new List<string> { "a", "b" }, "bar");

             var result = test.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"foo\" : {\"settings\" : {\"a\" : {\"b\" : \"bar\"}}}}}}", result);

+            Assert.AreEqual("{\"filters\" : {\"foo\" : {\"settings\" : {\"a\" : {\"b\" : \"bar\"}}}}", result);

             

         }

 

@@ -75,7 +75,7 @@ namespace Tests
             var mime = new MailMessage();

             test.AddHeader(mime);

             var result = mime.Headers.Get("x-smtpapi");

-            Assert.AreEqual("{\"data\" : {\"sub\" : {\"foo\" : [\"a\", \"b\"]}}}", result);

+            Assert.AreEqual("{\"sub\" : {\"foo\" : [\"a\", \"b\"]}}", result);

         }

 

         [Test]

@@ -88,7 +88,7 @@ namespace Tests
             test = new Header();

             test.AddSubVal("foo", new List<string>{"a", "b"});

             result = test.AsJson();

-            Assert.AreEqual("{\"data\" : {\"sub\" : {\"foo\" : [\"a\", \"b\"]}}}", result);

+            Assert.AreEqual("{\"sub\" : {\"foo\" : [\"a\", \"b\"]}}", result);

         }

     }

 }

diff --git a/SendGrid/Tests/TestSendgrid.cs b/SendGrid/Tests/TestSendgrid.cs
index 97bb7a0..22e8bb7 100755
--- a/SendGrid/Tests/TestSendgrid.cs
+++ b/SendGrid/Tests/TestSendgrid.cs
@@ -20,7 +20,7 @@ namespace Tests
             sendgrid.DisableGravatar();

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"gravatar\" : {\"settings\" : {\"enable\" : \"0\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"gravatar\" : {\"settings\" : {\"enable\" : \"0\"}}}}", json);

         }

 

         [Test]

@@ -32,7 +32,7 @@ namespace Tests
             sendgrid.DisableOpenTracking();

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"opentrack\" : {\"settings\" : {\"enable\" : \"0\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"opentrack\" : {\"settings\" : {\"enable\" : \"0\"}}}}", json);

         }

 

         [Test]

@@ -44,7 +44,7 @@ namespace Tests
             sendgrid.DisableClickTracking();

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"clicktrack\" : {\"settings\" : {\"enable\" : \"0\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"clicktrack\" : {\"settings\" : {\"enable\" : \"0\"}}}}", json);

         }

 

         [Test]

@@ -56,7 +56,7 @@ namespace Tests
             sendgrid.DisableSpamCheck();

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"spamcheck\" : {\"settings\" : {\"enable\" : \"0\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"spamcheck\" : {\"settings\" : {\"enable\" : \"0\"}}}}", json);

         }

 

         [Test]

@@ -68,7 +68,7 @@ namespace Tests
             sendgrid.DisableUnsubscribe();

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"subscriptiontrack\" : {\"settings\" : {\"enable\" : \"0\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"subscriptiontrack\" : {\"settings\" : {\"enable\" : \"0\"}}}}", json);

         }

 

         [Test]

@@ -80,7 +80,7 @@ namespace Tests
             sendgrid.DisableFooter();

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"footer\" : {\"settings\" : {\"enable\" : \"0\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"footer\" : {\"settings\" : {\"enable\" : \"0\"}}}}", json);

         }

 

         [Test]

@@ -92,7 +92,7 @@ namespace Tests
             sendgrid.DisableGoogleAnalytics();

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"ganalytics\" : {\"settings\" : {\"enable\" : \"0\"}}}}}", json);            

+            Assert.AreEqual("{\"filters\" : {\"ganalytics\" : {\"settings\" : {\"enable\" : \"0\"}}}}", json);            

         }

 

         [Test]

@@ -104,7 +104,7 @@ namespace Tests
             sendgrid.DisableTemplate();

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"template\" : {\"settings\" : {\"enable\" : \"0\"}}}}}", json);  

+            Assert.AreEqual("{\"filters\" : {\"template\" : {\"settings\" : {\"enable\" : \"0\"}}}}", json);  

         }

 

         [Test]

@@ -116,7 +116,7 @@ namespace Tests
             sendgrid.DisableBcc();

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"bcc\" : {\"settings\" : {\"enable\" : \"0\"}}}}}", json);  

+            Assert.AreEqual("{\"filters\" : {\"bcc\" : {\"settings\" : {\"enable\" : \"0\"}}}}", json);  

         }

 

         [Test]

@@ -128,7 +128,7 @@ namespace Tests
             sendgrid.DisableBypassListManagement();

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"bypass_list_management\" : {\"settings\" : {\"enable\" : \"0\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"bypass_list_management\" : {\"settings\" : {\"enable\" : \"0\"}}}}", json);

         }

 

         [Test]

@@ -140,7 +140,7 @@ namespace Tests
             sendgrid.EnableGravatar();

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"gravatar\" : {\"settings\" : {\"enable\" : \"1\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"gravatar\" : {\"settings\" : {\"enable\" : \"1\"}}}}", json);

         }

 

         [Test]

@@ -152,7 +152,7 @@ namespace Tests
             sendgrid.EnableOpenTracking();

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"opentrack\" : {\"settings\" : {\"enable\" : \"1\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"opentrack\" : {\"settings\" : {\"enable\" : \"1\"}}}}", json);

         }

 

         [Test]

@@ -164,7 +164,7 @@ namespace Tests
             sendgrid.EnableClickTracking(text);

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"clicktrack\" : {\"settings\" : {\"enable\" : \"1\",\"text\" : \"hello world\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"clicktrack\" : {\"settings\" : {\"enable\" : \"1\",\"text\" : \"hello world\"}}}}", json);

         }

 

         [Test]

@@ -178,7 +178,7 @@ namespace Tests
             sendgrid.EnableSpamCheck(score, url);

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"spamcheck\" : {\"settings\" : {\"enable\" : \"1\",\"score\" : \"5\",\"url\" : \"http:\\/\\/www.example.com\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"spamcheck\" : {\"settings\" : {\"enable\" : \"1\",\"score\" : \"5\",\"url\" : \"http:\\/\\/www.example.com\"}}}}", json);

         }

 

         [Test]

@@ -201,8 +201,8 @@ namespace Tests
             var jsonLanding = "\"landing\" : \""+landing+"\"";

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"subscriptiontrack\" : {\"settings\" : {\"enable\" : \"1\","+

-                jsonText+","+jsonHtml+","+jsonReplace+","+jsonUrl+","+jsonLanding+"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"subscriptiontrack\" : {\"settings\" : {\"enable\" : \"1\","+

+                jsonText+","+jsonHtml+","+jsonReplace+","+jsonUrl+","+jsonLanding+"}}}}", json);

 

         }

 

@@ -219,7 +219,7 @@ namespace Tests
             sendgrid.EnableFooter(text, html);

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"footer\" : {\"settings\" : {\"enable\" : \"1\",\"text\" : \""+text+"\",\"html\" : \""+escHtml+"\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"footer\" : {\"settings\" : {\"enable\" : \"1\",\"text\" : \""+text+"\",\"html\" : \""+escHtml+"\"}}}}", json);

         }

 

         [Test]

@@ -243,8 +243,8 @@ namespace Tests
             var jsonCampaign = "\"campaign\" : \""+campaign+"\"";

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"ganalytics\" : {\"settings\" : {\"enable\" : \"1\","+

-                            jsonSource+","+jsonMedium+","+jsonTerm+","+jsonContent+","+jsonCampaign+"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"ganalytics\" : {\"settings\" : {\"enable\" : \"1\","+

+                            jsonSource+","+jsonMedium+","+jsonTerm+","+jsonContent+","+jsonCampaign+"}}}}", json);

         }

 

         [Test]

@@ -258,7 +258,7 @@ namespace Tests
             sendgrid.EnableTemplate(html);

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"template\" : {\"settings\" : {\"enable\" : \"1\",\"html\" : \""+escHtml+"\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"template\" : {\"settings\" : {\"enable\" : \"1\",\"html\" : \""+escHtml+"\"}}}}", json);

         }

 

         [Test]

@@ -271,7 +271,7 @@ namespace Tests
             sendgrid.EnableBcc(email);

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"bcc\" : {\"settings\" : {\"enable\" : \"1\",\"email\" : \"" + email + "\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"bcc\" : {\"settings\" : {\"enable\" : \"1\",\"email\" : \"" + email + "\"}}}}", json);

         }

 

         [Test]

@@ -283,7 +283,7 @@ namespace Tests
             sendgrid.EnableBypassListManagement();

 

             String json = header.AsJson();

-            Assert.AreEqual("{\"data\" : {\"filters\" : {\"bypass_list_management\" : {\"settings\" : {\"enable\" : \"1\"}}}}}", json);

+            Assert.AreEqual("{\"filters\" : {\"bypass_list_management\" : {\"settings\" : {\"enable\" : \"1\"}}}}", json);

         }

     }

 }

diff --git a/SendGrid/Tests/TestSendgridMessageSetup.cs b/SendGrid/Tests/TestSendgridMessageSetup.cs
index c2ad73d..219dbf3 100755
--- a/SendGrid/Tests/TestSendgridMessageSetup.cs
+++ b/SendGrid/Tests/TestSendgridMessageSetup.cs
@@ -1,10 +1,8 @@
 using System;

-using System.Collections;

 using System.Collections.Generic;

 using System.Linq;

 using System.Net.Mail;

 using System.Net.Mime;

-using System.Text;

 using Moq;

 using NUnit.Framework;

 using SendGridMail;