Merge branch 'us1882' of github.com:sendgrid/sendgrid-csharp into us1882

Conflicts:
	SendGrid/Example/Program.cs

6 files changed, 311 insertions, 29 deletions

diff --git a/SendGrid/Tests/TestHeader.cs b/SendGrid/Tests/TestHeader.cs
index 0175b38..76025aa 100755
--- a/SendGrid/Tests/TestHeader.cs
+++ b/SendGrid/Tests/TestHeader.cs
@@ -1,6 +1,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

+using System.Net.Mail;

 using System.Text;

 using Moq;

 using NUnit.Framework;

@@ -12,9 +13,82 @@ namespace Tests
     public class TestHeader

     {

         [Test]

-        public void TestAddTo()

+        public void TestAddSubVal()

         {

+            var test = new Header();

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

+            var result = test.AsJson();

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

+        }

+

+        [Test]

+        public void TestAddUniqueIdentifier()

+        {

+            var test = new Header();

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

+            var result = test.AsJson();

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

+        }

+

+        [Test]

+        public void TestSetCategory()

+        {

+            var test = new Header();

+            test.SetCategory("foo");

+            var result = test.AsJson();

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

+        }

+

+        [Test]

+        public void TestEnable()

+        {

+            var test = new Header();

+            test.Enable("foo");

+            var result = test.AsJson();

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

+        }

+

+        [Test]

+        public void TestDisable()

+        {

+            var test = new Header();

+            test.Disable("foo");

+            var result = test.AsJson();

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

+        }

+

+        [Test]

+        public void TestAddFilterSetting()

+        {

+            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);

             

         }

+

+        [Test]

+        public void TestAddHeader()

+        {

+            var test = new Header();

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

+            var mime = new MailMessage();

+            test.AddHeader(mime);

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

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

+        }

+

+        [Test]

+        public void TestAsJson()

+        {

+            var test = new Header();

+            var result = test.AsJson();

+            Assert.AreEqual("", result);

+

+            test = new Header();

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

+            result = test.AsJson();

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

+        }

     }

 }

diff --git a/SendGrid/Tests/TestJsonUtils.cs b/SendGrid/Tests/TestJsonUtils.cs
index b06e153..b8f4aae 100755
--- a/SendGrid/Tests/TestJsonUtils.cs
+++ b/SendGrid/Tests/TestJsonUtils.cs
@@ -12,11 +12,6 @@ namespace Tests
         {

             Assert.AreEqual("1", JsonUtils.Serialize(1));

             Assert.AreEqual("\"\\\"foo\\\"\"", JsonUtils.Serialize("\"foo\""));

-

-            var arg = Encoding.UTF8.GetString(Encoding.ASCII.GetBytes("добры дзень"));

-            var result = JsonUtils.Serialize(arg);

-            System.Console.WriteLine(arg + " => " + result);

-            Assert.AreEqual("", result);

         }

     }

 }

diff --git a/SendGrid/Tests/TestSendgridMessageSetup.cs b/SendGrid/Tests/TestSendgridMessageSetup.cs
index 6ec4d7b..2e43598 100755
--- a/SendGrid/Tests/TestSendgridMessageSetup.cs
+++ b/SendGrid/Tests/TestSendgridMessageSetup.cs
@@ -1,7 +1,10 @@
 using System;

+using System.Collections;

 using System.Collections.Generic;

 using System.Linq;

+using System.Net.Mail;

 using System.Text;

+using Moq;

 using NUnit.Framework;

 using SendGridMail;

 

@@ -13,7 +16,124 @@ namespace Tests
         [Test]

         public void TestAddTo()

         {

+            var foo = new Mock<IHeader>();

 

+            var sg = new SendGrid(foo.Object);

+            sg.AddTo("eric@sendgrid.com");

+            Assert.AreEqual("eric@sendgrid.com", sg.To.First().ToString(), "Single To Address" );

+

+            sg = new SendGrid(foo.Object);

+            var strings = new String[2];

+            strings[0] = "eric@sendgrid.com";

+            strings[1] = "tyler@sendgrid.com";

+            sg.AddTo(strings);

+            Assert.AreEqual("eric@sendgrid.com", sg.To[0].ToString(), "Multiple To addresses, check first one");

+            Assert.AreEqual("tyler@sendgrid.com", sg.To[1].ToString(), "Multiple To addresses, check second one");

+

+            sg = new SendGrid(foo.Object);

+            var a = new Dictionary<String, String>();

+            a.Add("DisplayName", "Eric");

+            var datastruct = new Dictionary<string, IDictionary<string, string>> {{"eric@sendgrid.com", a}};

+            sg.AddTo(datastruct);

+            Assert.AreEqual("Eric", sg.To.First().DisplayName, "Single address with args");

+        }

+

+        [Test]

+        public void TestAddCc()

+        {

+            var foo = new Mock<IHeader>();

+

+            var sg = new SendGrid(foo.Object);

+            sg.AddCc("eric@sendgrid.com");

+            Assert.AreEqual("eric@sendgrid.com", sg.Cc.First().ToString(), "Single CC Address");

+

+            sg = new SendGrid(foo.Object);

+            var strings = new String[2];

+            strings[0] = "eric@sendgrid.com";

+            strings[1] = "tyler@sendgrid.com";

+            sg.AddCc(strings);

+            Assert.AreEqual("eric@sendgrid.com", sg.Cc[0].ToString(), "Multiple CC addresses, check first one");

+            Assert.AreEqual("tyler@sendgrid.com", sg.Cc[1].ToString(), "Multiple CC addresses, check second one");

+

+            sg = new SendGrid(foo.Object);

+            var a = new Dictionary<String, String>();

+            a.Add("DisplayName", "Eric");

+            var datastruct = new Dictionary<string, IDictionary<string, string>> { { "eric@sendgrid.com", a } };

+            sg.AddCc(datastruct);

+            Assert.AreEqual("Eric", sg.Cc.First().DisplayName, "Single CC address with args");

+        }

+

+        [Test]

+        public void TestAddBcc()

+        {

+            var foo = new Mock<IHeader>();

+

+            var sg = new SendGrid(foo.Object);

+            sg.AddBcc("eric@sendgrid.com");

+            Assert.AreEqual("eric@sendgrid.com", sg.Bcc.First().ToString(), "Single Bcc Address");

+

+            sg = new SendGrid(foo.Object);

+            var strings = new String[2];

+            strings[0] = "eric@sendgrid.com";

+            strings[1] = "tyler@sendgrid.com";

+            sg.AddBcc(strings);

+            Assert.AreEqual("eric@sendgrid.com", sg.Bcc[0].ToString(), "Multiple addresses, check first one");

+            Assert.AreEqual("tyler@sendgrid.com", sg.Bcc[1].ToString(), "Multiple addresses, check second one");

+

+            sg = new SendGrid(foo.Object);

+            var a = new Dictionary<String, String>();

+            a.Add("DisplayName", "Eric");

+            var datastruct = new Dictionary<string, IDictionary<string, string>> { { "eric@sendgrid.com", a } };

+            sg.AddBcc(datastruct);

+            Assert.AreEqual("Eric", sg.Bcc.First().DisplayName, "Single address with args");

+        }

+

+        [Test]

+        public void TestSGHeader()

+        {

+            var foo = new Mock<IHeader>();

+            var sg = new SendGrid(foo.Object);

+

+            sg.Subject = "New Test Subject";

+            Assert.AreEqual("New Test Subject", sg.Subject, "Subject set ok");

+            sg.Subject = null;

+            Assert.AreEqual("New Test Subject", sg.Subject, "null subject does not overide previous subject");

+        }

+

+        /*

+        [Test]

+        public void TestAddSubVal()

+        {

+            var header = new Header();

+            var sg = new SendGrid(header);

+

+            var datastruct = new String[2];

+            datastruct[0] = "eric";

+            datastruct[1] = "tyler";

+

+            sg.AddSubVal("-name-", datastruct);

+            Assert.AreEqual("test", sg.Header);

+        }

+        */

+

+

+        [Test]

+        public void TestGetRcpts()

+        {

+            //public IEnumerable<String> GetRecipients()

+            var foo = new Mock<IHeader>();

+            var sg = new SendGrid(foo.Object);

+

+            sg.AddTo("eric@sendgrid.com");

+            sg.AddCc("tyler@sendgrid.com");

+            sg.AddBcc("cj@sendgrid.com");

+            sg.AddBcc("foo@sendgrid.com");

+

+            var rcpts = sg.GetRecipients();

+            Assert.AreEqual("eric@sendgrid.com", rcpts.First(), "getRecipients check To");

+            Assert.AreEqual("tyler@sendgrid.com", rcpts.Skip(1).First(), "getRecipients check Cc");

+            Assert.AreEqual("cj@sendgrid.com", rcpts.Skip(2).First(), "getRecipients check Bcc");

+            Assert.AreEqual("foo@sendgrid.com", rcpts.Skip(3).First(), "getRecipients check Bcc x2");

         }

     }

 }

diff --git a/SendGrid/Tests/TestTreeNode.cs b/SendGrid/Tests/TestTreeNode.cs
index 4b8a28f..1701d74 100755
--- a/SendGrid/Tests/TestTreeNode.cs
+++ b/SendGrid/Tests/TestTreeNode.cs
@@ -1,7 +1,6 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using System.Text;

 using NUnit.Framework;

 using SendGridMail;

 

@@ -11,47 +10,91 @@ namespace Tests
     public class TestTreeNode

     {

         [Test]

-        public void TestAddToTree()

+        public void TestAddSetting()

         {

-            var test = new Header.FilterNode();

+            var test = new Header.HeaderSettingsNode();

             test.AddSetting(new List<string>(), "foo");

             Assert.AreEqual("foo", test.GetLeaf(), "Get the leaf of the first node");

 

-            test = new Header.FilterNode();

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

+            test = new Header.HeaderSettingsNode();

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

             Assert.AreEqual("bar", test.GetSetting(new List<string>(){"foo"}), "Get the item in the first branch 'foo', make sure its set to 'bar'");

 

-            test = new Header.FilterNode();

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

+            test = new Header.HeaderSettingsNode();

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

             Assert.AreEqual("bar", test.GetSetting("foo"), "tests the convienence get setting function that omits the lists stuff...");

 

-            test = new Header.FilterNode();

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

+            test = new Header.HeaderSettingsNode();

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

             Assert.AreEqual("foobar", test.GetSetting("foo", "bar", "raz"), "tests a tree that is multiple branches deep");

 

-

-            test = new Header.FilterNode();

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

-            test.AddSetting(new List<string>() { "barfoo", "barbar", "barraz" }, "barfoobar");

+            test = new Header.HeaderSettingsNode();

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

+            test.AddSetting(new List<string> { "barfoo", "barbar", "barraz" }, "barfoobar");

             Assert.AreEqual("foobar", test.GetSetting("foo", "bar", "raz"), "tests a tree that has multiple branches");

             Assert.AreEqual("barfoobar", test.GetSetting("barfoo", "barbar", "barraz"), "tests the other branch");

+

+            test = new Header.HeaderSettingsNode();

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

+            try

+            {

+                test.AddSetting(new List<string> {"foo", "raz"}, "blam");

+                Assert.Fail("exception not thrown");

+            }

+            catch (ArgumentException ex)

+            {

+                Assert.AreEqual("Attempt to overwrite setting", ex.Message);

+            }

+

         }

 

         [Test]

         public void TestToJSON()

         {

-            var test = new Header.FilterNode();

+            var test = new Header.HeaderSettingsNode();

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

             

             var result = test.ToJson();

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

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

 

-            test = new Header.FilterNode();

+            test = new Header.HeaderSettingsNode();

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

             test.AddSetting(new List<string>() { "barfoo", "barbar", "barraz" }, "barfoobar");

             

             result = test.ToJson();

-            Assert.AreEqual("{\"foo\":{\"bar\":{\"raz\":\"foobar\"}},\"barfoo\":{\"barbar\":{\"barraz\":\"barfoobar\"}}}", result);

+            Assert.AreEqual("{\"foo\" : {\"bar\" : {\"raz\" : \"foobar\"}},\"barfoo\" : {\"barbar\" : {\"barraz\" : \"barfoobar\"}}}", result);

+

+            test = new Header.HeaderSettingsNode();

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

+            result = test.ToJson();

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

+

+        }

+

+        [Test]

+        public void TestAddArray()

+        {

+            var test = new Header.HeaderSettingsNode();

+            test.AddArray(new List<string>{"foo", "bar"}, new string[]{"raz", "blam"});

+            var result = test.GetArray("foo", "bar");

+            Assert.AreEqual(result.ToList()[0], "raz");

+            Assert.AreEqual(result.ToList()[1], "blam");

+        }

+

+        [Test]

+        public void TestIsEmpty()

+        {

+            var test = new Header.HeaderSettingsNode();

+            Assert.IsTrue(test.IsEmpty());

+

+            test = new Header.HeaderSettingsNode();

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

+            Assert.IsFalse(test.IsEmpty());

+

+            test = new Header.HeaderSettingsNode();

+            test.AddArray(new List<string> { "raz" }, new List<string>{"blam"});

+            Assert.IsFalse(test.IsEmpty());

+

         }

     }

 }

diff --git a/SendGrid/Tests/Transport/TestREST.cs b/SendGrid/Tests/Transport/TestREST.cs
index 747e540..ccbab48 100755
--- a/SendGrid/Tests/Transport/TestREST.cs
+++ b/SendGrid/Tests/Transport/TestREST.cs
@@ -10,7 +10,13 @@ namespace Tests.Transport
     class TestREST

     {

         [Test]

-        public void Deliver()

+        public void TestDeliver()

+        {

+            

+        }

+

+        [Test]

+        public void TestConstructor()

         {

             

         }

diff --git a/SendGrid/Tests/Transport/TestSMTP.cs b/SendGrid/Tests/Transport/TestSMTP.cs
index fcfb050..e0e4fe5 100755
--- a/SendGrid/Tests/Transport/TestSMTP.cs
+++ b/SendGrid/Tests/Transport/TestSMTP.cs
@@ -1,10 +1,9 @@
 using System;

-using System.Collections.Generic;

-using System.Linq;

 using System.Net;

-using System.Text;

+using System.Net.Mail;

 using Moq;

 using NUnit.Framework;

+using SendGridMail;

 using SendGridMail.Transport;

 

 namespace Tests.Transport

@@ -13,12 +12,57 @@ namespace Tests.Transport
     public class TestSMTP

     {

         [Test]

-        public void Deliver()

+        public void TestDeliver()

         {

+            var mockMessage = new Mock<ISendGrid>();

+            var mime = new MailMessage("test-from@sendgrid.com", "test-to@sendgrid.com", "this is a test", "it is only a test");

+            mockMessage.Setup(foo => foo.CreateMimeMessage()).Returns(mime);

+            var message = mockMessage.Object;

+

+            var mockClient = new Mock<SMTP.ISmtpClient>();

+            mockClient.Setup(foo => foo.Send(mime));

+            var client = mockClient.Object;

+            var credentials = new NetworkCredential("username", "password");

+            var test = SMTP.GenerateInstance(client, credentials);

+            test.Deliver(message);

+

+            mockClient.Verify(foo => foo.Send(mime), Times.Once());

+            mockMessage.Verify(foo => foo.CreateMimeMessage(), Times.Once());

+        }

+

+        [Test]

+        public void TestConstructor()

+        {

+            //Test on defaults of port 25 and 

             var mock = new Mock<SMTP.ISmtpClient>();

+            mock.SetupProperty(foo => foo.EnableSsl);

             var client = mock.Object;

             var credentials = new NetworkCredential("username", "password");

-            SMTP.GenerateInstance(client, credentials);

+            var test = SMTP.GenerateInstance(client, credentials);

+            mock.Verify(foo => foo.EnableSsl, Times.Never());

+

+            mock = new Mock<SMTP.ISmtpClient>();

+            mock.SetupProperty(foo => foo.EnableSsl);

+            client = mock.Object;

+            credentials = new NetworkCredential("username", "password");

+            test = SMTP.GenerateInstance(client, credentials, port:SMTP.SslPort);

+            mock.VerifySet(foo => foo.EnableSsl = true);

+

+            mock = new Mock<SMTP.ISmtpClient>();

+            mock.SetupProperty(foo => foo.EnableSsl);

+            client = mock.Object;

+            credentials = new NetworkCredential("username", "password");

+            try

+            {

+                test = SMTP.GenerateInstance(client, credentials, port: SMTP.TlsPort);

+                Assert.Fail("should have thrown an unsupported port exception");

+            }

+            catch (NotSupportedException ex)

+            {

+                Assert.AreEqual("TLS not supported", ex.Message);

+            }

+            

+            

         }

     }

 }