merged and added some new tests

1 files changed, 28 insertions, 11 deletions

diff --git a/SendGrid/Tests/TestSendgrid.cs b/SendGrid/Tests/TestSendgrid.cs
index 71160dc..95604d3 100755
--- a/SendGrid/Tests/TestSendgrid.cs
+++ b/SendGrid/Tests/TestSendgrid.cs
@@ -191,20 +191,34 @@ namespace Tests
 

             var text = "<% %>";

             var html = "<% name %>";

-            var replace = "John";

-            var url = "http://www.example.com";

-            var landing = "this_landing";

-            sendgrid.EnableUnsubscribe(text, html, replace, url, landing);

 

-            var jsonText = "\"text\\/plain\" : \""+text+"\"";

-            var jsonHtml = "\"text\\/html\" : \""+html+"\"";

-            var jsonReplace = "\"replace\" : \""+replace+"\"";

-            var jsonUrl = "\"url\" : \"http:\\/\\/www.example.com\"";

-            var jsonLanding = "\"landing\" : \""+landing+"\"";

+            var jsonText = "\"text\\/plain\" : \"" + text + "\"";

+            var jsonHtml = "\"text\\/html\" : \"" + html + "\"";

+

+            sendgrid.EnableUnsubscribe(text, html);

 

             String json = header.AsJson();

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

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

+                jsonText+","+jsonHtml+"}}}}", json);

+

+            header = new Header();

+            sendgrid = new SendGrid(header);

+

+            var replace = "John";

+            var jsonReplace = "\"replace\" : \"" + replace + "\"";

+

+            sendgrid.EnableUnsubscribe(replace);

+

+            json = header.AsJson();

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

+

+            text = "bad";

+            html = "<% name %>";

+            Assert.Throws<Exception>(delegate { sendgrid.EnableUnsubscribe(text, html); });

+

+            text = "<% %>";

+            html = "bad";

+            Assert.Throws<Exception>(delegate { sendgrid.EnableUnsubscribe(text, html); });

 

         }

 

@@ -261,6 +275,9 @@ namespace Tests
 

             String json = header.AsJson();

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

+

+            escHtml = "bad";

+            Assert.Throws<Exception>(delegate { sendgrid.EnableTemplate(escHtml); });

         }

 

         [Test]

@@ -291,7 +308,7 @@ namespace Tests
         [Test]

         public void CreateMimeMessage()

         {

-            var message = SendGrid.GenerateInstance();

+            var message = SendGrid.GetInstance();

             var attachment = System.IO.Path.GetTempFileName();

             var text = "this is a test";

             var html = "<b>This<\b> is a better test";