diff options
| -rwxr-xr-x[-rw-r--r--] | README | 0 | ||||
| -rwxr-xr-x | SendGrid/Example/Program.cs | 20 | ||||
| -rwxr-xr-x | SendGrid/SendGridMail/Header.cs | 36 | ||||
| -rwxr-xr-x | SendGrid/SendGridMail/ISendGrid.cs | 2 | ||||
| -rwxr-xr-x | SendGrid/SendGridMail/Properties/AssemblyInfo.cs | 7 | ||||
| -rwxr-xr-x | SendGrid/SendGridMail/SendGrid.cs | 64 | ||||
| -rwxr-xr-x | SendGrid/Tests/TestHeader.cs | 76 | ||||
| -rwxr-xr-x | SendGrid/Tests/TestJsonUtils.cs | 5 | ||||
| -rwxr-xr-x | SendGrid/Tests/TestSendgridMessageSetup.cs | 120 | ||||
| -rwxr-xr-x | SendGrid/Tests/TestTreeNode.cs | 77 | ||||
| -rwxr-xr-x | SendGrid/Tests/Transport/TestREST.cs | 8 | ||||
| -rwxr-xr-x | SendGrid/Tests/Transport/TestSMTP.cs | 54 |
12 files changed, 382 insertions, 87 deletions
diff --git a/SendGrid/Example/Program.cs b/SendGrid/Example/Program.cs index 5e5909c..b14474c 100755 --- a/SendGrid/Example/Program.cs +++ b/SendGrid/Example/Program.cs @@ -14,19 +14,15 @@ namespace Example static void Main(string[] args)
{
var header = new Header();
- var sendgrid = new SendGrid(header);
-
- Console.WriteLine("testing");
-
- var text = "My Text <%%>";
- var html = "<body><p>hello,</p></body>";
- var replace = "John";
- var url = "http://www.example.com";
- var landing = "this_landing";
- sendgrid.EnableUnsubscribe(text, html, replace, url, landing);
-
- Console.WriteLine(header.AsJson());
+ var transport = SMTP.GenerateInstance(new NetworkCredential("sgrid_username", "sgrid_password"));
+ var message = new SendGrid(header);
+ message.AddTo("eric.becking@sendgrid.com");
+ message.From = new MailAddress("eric@sendgrid.com");
+ message.Text = "This is a test message.";
+ message.Html = "<html><p>This is a <b>test</b> message.</p></html>";
+ message.Subject = "hazaah!";
+ transport.Deliver(message);
}
}
}
diff --git a/SendGrid/SendGridMail/Header.cs b/SendGrid/SendGridMail/Header.cs index 9aaa440..c1138d8 100755 --- a/SendGrid/SendGridMail/Header.cs +++ b/SendGrid/SendGridMail/Header.cs @@ -7,11 +7,11 @@ namespace SendGridMail {
public class Header : IHeader
{
- private readonly FilterNode _settings;
+ private readonly HeaderSettingsNode _settings;
public Header()
{
- _settings = new FilterNode();
+ _settings = new HeaderSettingsNode();
}
public void AddSubVal(string tag, IEnumerable<string> substitutions)
@@ -48,7 +48,7 @@ namespace SendGridMail public void AddFilterSetting(string filter, IEnumerable<string> settings, string value)
{
- var keys = new List<string>() {"filters", "data", filter, "settings"}.Concat(settings).ToList();
+ var keys = new List<string>() { "data", "filters", filter, "settings" }.Concat(settings).ToList();
_settings.AddSetting(keys, value);
}
@@ -63,15 +63,15 @@ namespace SendGridMail return _settings.ToJson();
}
- internal class FilterNode
+ internal class HeaderSettingsNode
{
- private readonly Dictionary<String, FilterNode> _branches;
+ private readonly Dictionary<String, HeaderSettingsNode> _branches;
private IEnumerable<String> _array;
private String _leaf;
- public FilterNode()
+ public HeaderSettingsNode()
{
- _branches = new Dictionary<string, FilterNode>();
+ _branches = new Dictionary<string, HeaderSettingsNode>();
}
public void AddArray(List<String> keys, IEnumerable<String> value)
@@ -87,7 +87,7 @@ namespace SendGridMail var key = keys.First();
if (!_branches.ContainsKey(key))
- _branches[key] = new FilterNode();
+ _branches[key] = new HeaderSettingsNode();
var remainingKeys = keys.Skip(1).ToList();
_branches[key].AddArray(remainingKeys, value);
@@ -107,7 +107,7 @@ namespace SendGridMail var key = keys.First();
if (!_branches.ContainsKey(key))
- _branches[key] = new FilterNode();
+ _branches[key] = new HeaderSettingsNode();
var remainingKeys = keys.Skip(1).ToList();
_branches[key].AddSetting(remainingKeys, value);
@@ -130,6 +130,22 @@ namespace SendGridMail return _branches[key].GetSetting(remainingKeys);
}
+ public IEnumerable<String> GetArray(params String[] keys)
+ {
+ return GetArray(keys.ToList());
+ }
+
+ public IEnumerable<String> GetArray(List<String> keys)
+ {
+ if (keys.Count == 0)
+ return _array;
+ var key = keys.First();
+ if (!_branches.ContainsKey(key))
+ throw new ArgumentException("Bad key path!");
+ var remainingKeys = keys.Skip(1).ToList();
+ return _branches[key].GetArray(remainingKeys);
+ }
+
public String GetLeaf()
{
return _leaf;
@@ -142,7 +158,7 @@ namespace SendGridMail if (_leaf != null)
return JsonUtils.Serialize(_leaf);
if (_array != null)
- return "[" + String.Join(",", _array.Select(i => JsonUtils.Serialize(i))) + "]";
+ return "[" + String.Join(", ", _array.Select(i => JsonUtils.Serialize(i))) + "]";
return "{}";
}
diff --git a/SendGrid/SendGridMail/ISendGrid.cs b/SendGrid/SendGridMail/ISendGrid.cs index e8e5fb2..8c07947 100755 --- a/SendGrid/SendGridMail/ISendGrid.cs +++ b/SendGrid/SendGridMail/ISendGrid.cs @@ -45,7 +45,7 @@ namespace SendGridMail void AddBcc(IEnumerable<String> addresses);
void AddBcc(IDictionary<String, IDictionary<String, String>> addresssInfo);
- void AddSubVal(String tag, String value);
+ void AddSubVal(String tag, params String[] value);
void AddAttachment(String filePath);
void AddAttachment(Attachment attachment);
diff --git a/SendGrid/SendGridMail/Properties/AssemblyInfo.cs b/SendGrid/SendGridMail/Properties/AssemblyInfo.cs index 0cefaba..0108aa9 100755 --- a/SendGrid/SendGridMail/Properties/AssemblyInfo.cs +++ b/SendGrid/SendGridMail/Properties/AssemblyInfo.cs @@ -23,6 +23,13 @@ using System.Runtime.InteropServices; [assembly: Guid("193fa200-8430-4206-aacd-2d2bb2dfa6cf")]
[assembly: InternalsVisibleTo("Tests")]
+[assembly:InternalsVisibleTo("DynamicProxyGenAssembly2," +
+"1310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b" +
+"PublicKey=002400000480000094000000060200000024000052534" +
+"3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d926665" +
+"4753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb" +
+"4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c486" +
+"1eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
// Version information for an assembly consists of the following four values:
//
diff --git a/SendGrid/SendGridMail/SendGrid.cs b/SendGrid/SendGridMail/SendGrid.cs index 750a9ff..8ad0216 100755 --- a/SendGrid/SendGridMail/SendGrid.cs +++ b/SendGrid/SendGridMail/SendGrid.cs @@ -12,12 +12,19 @@ namespace SendGridMail {
public class SendGrid : ISendGrid
{
+ #region constants/vars
+ //private/constant vars:
private Dictionary<String, String> _filters;
+ private MailMessage message;
+
+ // TODO find appropriate types for these
+ const string encoding = "quoted-printable";
+ const string charset = "utf-8";
//apps list and settings
private const String ReText = @"<\%\s*\%>";
private const String ReHtml = @"<\%\s*[^\s]+\s*\%>";
-
+ #endregion
public void InitializeFilters()
{
@@ -37,28 +44,6 @@ namespace SendGridMail };
}
- private MailMessage message;
-
- // TODO find appropriate types for these
- const string encoding = "quoted-printable";
- const string charset = "utf-8";
-
- /*
- if (Html != null )
- {
- AlternateView htmlView = AlternateView.CreateAlternateViewFromString(html, null, "text/html");
- message.AlternateViews.Add(htmlView);
- }
-
- if (Text != null )
- {
- AlternateView plainView = AlternateView.CreateAlternateViewFromString(Text, null, "text/plain");
- message.AlternateViews.Add(plainView);
- }
-
- message.BodyEncoding = Encoding.GetEncoding(charset);
- */
-
public SendGrid(MailAddress from, MailAddress[] to, MailAddress[] cc, MailAddress[] bcc,
String subject, String html, String text, TransportType transport, IHeader header = null )
{
@@ -70,8 +55,6 @@ namespace SendGridMail Cc = cc;
Bcc = bcc;
- _subs = new Dictionary<string, string>();
-
message.Subject = subject;
message.SubjectEncoding = Encoding.GetEncoding(charset);
@@ -162,10 +145,8 @@ namespace SendGridMail }
public IHeader Header { get; set; }
-
public String Html { get; set; }
public String Text { get; set; }
-
public TransportType Transport { get; set; }
#endregion
@@ -254,15 +235,13 @@ namespace SendGridMail }
}
- private Dictionary<string, string> _subs;
-
- public void AddSubVal(string tag, string value)
+ public void AddSubVal(String tag, params String[] value)
{
//let the system complain if they do something bad, since the function returns null
- _subs[tag] = value;
+ Header.AddSubVal(tag, value);
}
- public void AddAttachment(string filePath)
+ public void AddAttachment(String filePath)
{
var data = new Attachment(filePath, MediaTypeNames.Application.Octet);
message.Attachments.Add(data);
@@ -276,9 +255,10 @@ namespace SendGridMail public void AddAttachment(Stream attachment, ContentType type)
{
var data = new Attachment(attachment, type);
+ message.Attachments.Add(data);
}
- public IEnumerable<string> GetRecipients()
+ public IEnumerable<String> GetRecipients()
{
List<MailAddress> tos = message.To.ToList();
List<MailAddress> ccs = message.CC.ToList();
@@ -288,12 +268,12 @@ namespace SendGridMail return rcpts;
}
- private string Get(string field)
+ private string Get(String field)
{
throw new NotImplementedException();
}
- private void Set(string field, string value)
+ private void Set(String field, String value)
{
throw new NotImplementedException();
}
@@ -454,6 +434,20 @@ namespace SendGridMail if (!String.IsNullOrEmpty(smtpapi))
message.Headers.Add("X-SmtpApi", "{" + smtpapi + "}");
+ if (Html != null)
+ {
+ AlternateView htmlView = AlternateView.CreateAlternateViewFromString(Html, null, "text/html");
+ message.AlternateViews.Add(htmlView);
+ }
+
+ if (Text != null)
+ {
+ AlternateView plainView = AlternateView.CreateAlternateViewFromString(Text, null, "text/plain");
+ message.AlternateViews.Add(plainView);
+ }
+
+ message.BodyEncoding = Encoding.GetEncoding(charset);
+
return message;
}
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);
+ }
+
+
}
}
}
|