Merge branch 'v3release'v7.0.1v7.0.0

8 files changed, 0 insertions, 745 deletions

diff --git a/SendGrid/Tests/Properties/AssemblyInfo.cs b/SendGrid/Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8b518a9..0000000
--- a/SendGrid/Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Reflection;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-

-[assembly: AssemblyTitle("Tests")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("Tests")]

-[assembly: AssemblyCopyright("Copyright ©  2012")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-

-[assembly: Guid("ce0ad7f8-ecce-46c6-a057-f7aa74bb3518")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-

-[assembly: AssemblyVersion("1.2.0")]

-[assembly: AssemblyFileVersion("1.2.0")]
\ No newline at end of file
diff --git a/SendGrid/Tests/TestSendgrid.cs b/SendGrid/Tests/TestSendgrid.cs
deleted file mode 100644
index 3ce0c6e..0000000
--- a/SendGrid/Tests/TestSendgrid.cs
+++ /dev/null
@@ -1,418 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.IO;

-using System.Net.Mail;

-using NUnit.Framework;

-using SendGrid.SmtpApi;

-using SendGrid;

-

-namespace Tests

-{

-    [TestFixture]

-    internal class TestSendgrid

-    {

-        [Test]

-        public void CreateMimeMessage()

-        {

-            var message = new SendGridMessage();

-            var attachment = Path.GetTempFileName();

-            var text = "this is a test";

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

-            var headers = new KeyValuePair<String, String>("custom", "header");

-            message.AddAttachment(attachment);

-            message.Text = text;

-            message.Html = html;

-            message.AddTo("foo@bar.com");

-            message.From = new MailAddress("foo@bar.com");

-            message.AddHeaders(new Dictionary<string, string> {{headers.Key, headers.Value}});

-            message.EnableGravatar();

-

-            var mime = message.CreateMimeMessage();

-

-            var sr = new StreamReader(mime.AlternateViews[0].ContentStream);

-            var result = sr.ReadToEnd();

-            Assert.AreEqual(text, result);

-

-            sr = new StreamReader(mime.AlternateViews[1].ContentStream);

-            result = sr.ReadToEnd();

-            Assert.AreEqual(html, result);

-

-            result = mime.Headers.Get(headers.Key);

-            Assert.AreEqual(headers.Value, result);

-

-            result = mime.Headers.Get("X-Smtpapi");

-            var expected = "{\"filters\" : {\"gravatar\" : {\"settings\" : {\"enable\" : \"1\"}}}}";

-            Assert.AreEqual(expected, result);

-

-            result = mime.Attachments[0].Name;

-            Assert.AreEqual(Path.GetFileName(attachment), result);

-        }

-

-        [Test]

-        public void DisableBcc()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.DisableBcc();

-

-            var json = header.JsonString();

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

-        }

-

-        [Test]

-        public void DisableBypassListManagement()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.DisableBypassListManagement();

-

-            var json = header.JsonString();

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

-        }

-

-        [Test]

-        public void DisableClickTracking()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.DisableClickTracking();

-

-            var json = header.JsonString();

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

-        }

-

-        [Test]

-        public void DisableFooter()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.DisableFooter();

-

-            var json = header.JsonString();

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

-        }

-

-        [Test]

-        public void DisableGoogleAnalytics()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.DisableGoogleAnalytics();

-

-            var json = header.JsonString();

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

-        }

-

-        [Test]

-        public void DisableSpamCheck()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.DisableSpamCheck();

-

-            var json = header.JsonString();

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

-        }

-

-        [Test]

-        public void DisableTemplate()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.DisableTemplate();

-

-            var json = header.JsonString();

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

-        }

-

-        [Test]

-        public void DisableUnsubscribe()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.DisableUnsubscribe();

-

-            var json = header.JsonString();

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

-        }

-

-        [Test]

-        public void EnableBcc()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            var email = "somebody@someplace.com";

-            sendgrid.EnableBcc(email);

-

-            var json = header.JsonString();

-            Assert.AreEqual(

-                "{\"filters\" : {\"bcc\" : {\"settings\" : {\"enable\" : \"1\",\"email\" : \"" + email + "\"}}}}",

-                json);

-        }

-

-        [Test]

-        public void EnableBypassListManagement()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.EnableBypassListManagement();

-

-            var json = header.JsonString();

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

-        }

-

-        [Test]

-        public void EnableClickTracking()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-            sendgrid.EnableClickTracking(true);

-

-            var json = header.JsonString();

-            Assert.AreEqual(

-                "{\"filters\" : {\"clicktrack\" : {\"settings\" : {\"enable\" : \"1\",\"enable_text\" : \"1\"}}}}",

-                json);

-        }

-

-        [Test]

-        public void EnableFooter()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            var text = "My Text";

-            var html = "<body><p>hello, <% name %></p></body>";

-            var escHtml = "<body><p>hello, <% name %><\\/p><\\/body>";

-

-            sendgrid.EnableFooter(text, html);

-

-            var json = header.JsonString();

-            Assert.AreEqual(

-                "{\"filters\" : {\"footer\" : {\"settings\" : {\"enable\" : \"1\",\"text\\/plain\" : \"" + text +

-                "\",\"text\\/html\" : \"" + escHtml + "\"}}}}", json);

-        }

-

-        [Test]

-        public void EnableGoogleAnalytics()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            var source = "SomeDomain.com";

-            var medium = "Email";

-            var term = "keyword1, keyword2, keyword3";

-            var content = "PG, PG13";

-            var campaign = "my_campaign";

-

-            sendgrid.EnableGoogleAnalytics(source, medium, term, content, campaign);

-

-            var jsonSource = "\"utm_source\" : \"SomeDomain.com\"";

-            var jsonMedium = "\"utm_medium\" : \"" + medium + "\"";

-            var jsonTerm = "\"utm_term\" : \"" + term + "\"";

-            var jsonContent = "\"utm_content\" : \"" + content + "\"";

-            var jsonCampaign = "\"utm_campaign\" : \"" + campaign + "\"";

-

-            var json = header.JsonString();

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

-                            jsonSource + "," + jsonMedium + "," + jsonTerm + "," + jsonContent + "," + jsonCampaign +

-                            "}}}}",

-                json);

-        }

-

-        [Test]

-        public void EnableGravatar()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.EnableGravatar();

-

-            var json = header.JsonString();

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

-        }

-

-        [Test]

-        public void EnableOpenTracking()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.EnableOpenTracking();

-

-            var json = header.JsonString();

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

-        }

-

-        [Test]

-        public void EnableSpamCheck()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            var score = 5;

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

-            sendgrid.EnableSpamCheck(score, url);

-

-            var json = header.JsonString();

-            Assert.AreEqual(

-                "{\"filters\" : {\"spamcheck\" : {\"settings\" : {\"enable\" : \"1\",\"maxscore\" : \"5\",\"url\" : \"http:\\/\\/www.example.com\"}}}}",

-                json);

-        }

-

-        [Test]

-        public void EnableTemplate()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-            var html = "<% body %>";

-

-            var escHtml = "<% body %>";

-            sendgrid.EnableTemplate(html);

-

-            var json = header.JsonString();

-            Assert.AreEqual(

-                "{\"filters\" : {\"template\" : {\"settings\" : {\"enable\" : \"1\",\"text\\/html\" : \"" + escHtml +

-                "\"}}}}", json);

-

-            escHtml = "bad";

-            Assert.Throws<Exception>(() => sendgrid.EnableTemplate(escHtml));

-        }

-

-        [Test]

-        public void EnableUnsubscribe()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            var text = "<% %>";

-            var html = "<% name %>";

-

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

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

-

-            sendgrid.EnableUnsubscribe(text, html);

-

-            var json = header.JsonString();

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

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

-

-            header = new Header();

-            sendgrid = new SendGridMessage(header);

-

-            var replace = "John";

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

-

-            sendgrid.EnableUnsubscribe(replace);

-

-            json = header.JsonString();

-            Assert.AreEqual(

-                "{\"filters\" : {\"subscriptiontrack\" : {\"settings\" : {\"enable\" : \"1\"," + jsonReplace + "}}}}",

-                json);

-

-            text = "bad";

-            html = "<% name %>";

-            Assert.Throws<Exception>(() => sendgrid.EnableUnsubscribe(text, html));

-

-            text = "<% %>";

-            html = "bad";

-            Assert.Throws<Exception>(() => sendgrid.EnableUnsubscribe(text, html));

-        }

-

-        [Test]

-        public void TestDisableGravatar()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.DisableGravatar();

-

-            var json = header.JsonString();

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

-        }

-

-        [Test]

-        public void TestDisableOpenTracking()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.DisableOpenTracking();

-

-            var json = header.JsonString();

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

-        }

-

-        [Test]

-        public void TestAddSection()

-        {

-            var header = new Header();

-            var sendgrid = new SendGridMessage(header);

-

-            sendgrid.AddSection("tag", "value");

-

-            var json = header.JsonString();

-            Assert.AreEqual("{\"section\" : {\"tag\" : \"value\"}}", json);

-        }

-

-        [Test]

-        public void TestSendToSink()

-        {

-            // Arrange

-

-            var message = new SendGridMessage();

-            message.To = new[]

-            {

-                new MailAddress("foo@bar.com", "Foo Bar"),

-            };

-            message.AddTo("foo1@bar1.com");

-

-            // Act

-

-            message.SendToSink();

-

-            // Assert

-

-            Assert.AreEqual("foo_at_bar.com@sink.sendgrid.net", message.To[0].Address);

-            Assert.AreEqual("Foo Bar", message.To[0].DisplayName);

-

-            Assert.AreEqual("foo1_at_bar1.com@sink.sendgrid.net", message.To[1].Address);

-            Assert.AreEqual("", message.To[1].DisplayName);

-        }

-

-        [Test]

-        public void TestSendToSinkOff()

-        {

-            // Arrange

-

-            var message = new SendGridMessage();

-            message.To = new[]

-            {

-                new MailAddress("foo@bar.com", "Foo Bar"),

-            };

-            message.AddTo("foo1@bar1.com");

-            message.SendToSink();

-

-            // Act

-

-            message.SendToSink(false);

-

-            // Assert

-

-            Assert.AreEqual("foo@bar.com", message.To[0].Address);

-            Assert.AreEqual("Foo Bar", message.To[0].DisplayName);

-

-            Assert.AreEqual("foo1@bar1.com", message.To[1].Address);

-            Assert.AreEqual("", message.To[1].DisplayName);

-        }

-    }

-}	

diff --git a/SendGrid/Tests/Tests.csproj b/SendGrid/Tests/Tests.csproj
deleted file mode 100644
index ff31ea6..0000000
--- a/SendGrid/Tests/Tests.csproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup Condition=" '$(Configuration)' == 'BuildNet45' ">

-    <SignAssembly>false</SignAssembly>

-    <DebugSymbols>True</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>False</Optimize>

-    <OutputPath>bin\BuildNet45\</OutputPath>

-    <DefineConstants>BUILD;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <Prefer32Bit>false</Prefer32Bit>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>True</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>False</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

-    <DefineConstants>TRACE, DEBUG</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <Prefer32Bit>false</Prefer32Bit>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <SignAssembly>true</SignAssembly>

-    <AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>

-    <Optimize>True</Optimize>

-    <OutputPath>bin\Release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <Prefer32Bit>false</Prefer32Bit>

-  </PropertyGroup>

-  <PropertyGroup>

-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>

-    <RestorePackages>true</RestorePackages>

-    <ProjectGuid>{0319E73A-7039-4858-B047-1EDF88BB6BD1}</ProjectGuid>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

-    <TargetFrameworkProfile />

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <AssemblyName>Tests</AssemblyName>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'BuildNet45|AnyCPU'">

-    <DefineConstants>TRACE, BUILD</DefineConstants>

-    <SignAssembly>false</SignAssembly>

-  </PropertyGroup>

-  <PropertyGroup>

-    <OutputType>Library</OutputType>

-  </PropertyGroup>

-  <PropertyGroup>

-    <SignAssembly>true</SignAssembly>

-  </PropertyGroup>

-  <PropertyGroup>

-    <AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="Microsoft.CSharp" />

-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

-    <Reference Include="Moq">

-      <HintPath>..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>

-    </Reference>

-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>

-      <Private>True</Private>

-    </Reference>

-    <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" Condition="'$(OS)' != 'Unix'">

-      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" Condition="'$(OS)' != 'Unix'">

-      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="nunit.framework">

-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>

-    </Reference>

-    <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" Condition="'$(OS)' != 'Unix'">

-      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL" Condition="'$(OS)' != 'Unix'">

-      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="SendGrid.SmtpApi">

-      <HintPath>..\packages\SendGrid.SmtpApi.1.3.1\lib\net40\SendGrid.SmtpApi.dll</HintPath>

-    </Reference>

-    <Reference Include="System" />

-    <Reference Include="System.Net" />

-    <Reference Include="System.Net.Http" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="TestSendgrid.cs" />

-    <Compile Include="Transport\TestErrorChecker.cs" />

-    <Compile Include="Transport\TestWebApi.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="app.config">

-      <SubType>Designer</SubType>

-    </None>

-    <None Include="packages.config">

-      <SubType>Designer</SubType>

-    </None>

-    <None Include="sendgrid-csharp.snk" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\SendGridMail\Mail.csproj">

-      <Project>{3C687BEF-FF50-44AD-8315-2D4237281AF8}</Project>

-      <Name>Mail</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\SendGrid\SendGrid.csproj">

-      <Project>{1c318867-440b-4eb9-99e3-c0cc2c556962}</Project>

-      <Name>SendGrid</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

-  </ItemGroup>

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

-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

-</Project>
\ No newline at end of file
diff --git a/SendGrid/Tests/Transport/TestErrorChecker.cs b/SendGrid/Tests/Transport/TestErrorChecker.cs
deleted file mode 100644
index f178064..0000000
--- a/SendGrid/Tests/Transport/TestErrorChecker.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace Transport
-{
-    #region Using Directives
-
-    using System;
-    using System.Net;
-    using System.Net.Http;
-
-    using Exceptions;
-
-    using NUnit.Framework;
-
-    using SendGrid;
-
-    #endregion
-
-    [TestFixture]
-    public class TestErrorChecker
-    {
-        private const string BadUsernameOrPasswordResponseMessage = "<result><message>error</message><errors><error>Bad username / password</error></errors></result>";
-
-        [Test]
-        [ExpectedException(typeof(InvalidApiRequestException))]
-        public void WhenHttpResponseContainsBadUserErrorItIsDetectedAndAInvalidApiRequestIsThrown()
-        {
-            var response = new HttpResponseMessage(HttpStatusCode.BadRequest)
-            {
-                Content = new StringContent(BadUsernameOrPasswordResponseMessage)
-            };
-
-            ErrorChecker.CheckForErrors(response);
-        }
-    }
-}
\ No newline at end of file
diff --git a/SendGrid/Tests/Transport/TestWebApi.cs b/SendGrid/Tests/Transport/TestWebApi.cs
deleted file mode 100644
index ecb1ad8..0000000
--- a/SendGrid/Tests/Transport/TestWebApi.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Net;

-using System.Net.Mail;

-using Moq;

-using NUnit.Framework;

-using SendGrid;

-

-namespace Transport

-{

-    [TestFixture]

-    internal class TestWebApi

-    {

-        private const string TestUsername = "username";

-        private const string TestPassword = "password";

-        private const string TestApiKey = "apikey";

-

-        [Test]

-        public void TestFetchFileBodies()

-        {

-            TestFetchFileBodiesHelper(new Web(new NetworkCredential(TestUsername, TestPassword)));

-            TestFetchFileBodiesHelper(new Web(TestApiKey));

-        }

-

-        public void TestFetchFileBodiesHelper(Web webApi)

-        {

-            // Test using credentials

-            var message = new Mock<ISendGrid>();

-            var attachments = new[] {"foo", "bar", "foobar"};

-            message.SetupProperty(foo => foo.Attachments, null);

-            var result = webApi.FetchFileBodies(message.Object);

-            Assert.AreEqual(0, result.Count);

-

-            message.SetupProperty(foo => foo.Attachments, attachments);

-            result = webApi.FetchFileBodies(message.Object);

-            Assert.AreEqual(attachments.Count(), result.Count);

-            for (var index = 0; index < attachments.Length; index++)

-                Assert.AreEqual(result[index].Value.Name, attachments[index]);

-        }

-

-        [Test]

-        public void TestFetchFormParams()

-        {

-            TestFetchFormParamsHelper(new Web(new NetworkCredential(TestUsername, TestPassword)), true);

-            TestFetchFormParamsHelper(new Web(TestApiKey), false);

-        }

-

-        public void TestFetchFormParamsHelper(Web webApi, bool credentials)

-        {

-            // Test Variables

-            const string toAddress = "foobar@outlook.com";

-            const string ccAddress = "cc@outlook.com";

-            const string bcc1Address = "bcc1@outlook.com";

-            const string bcc2Address = "bcc2@outlook.com";

-            MailAddress[] bccAddresses = {new MailAddress(bcc1Address), new MailAddress(bcc2Address)};

-            const string fromAddress = "test@outlook.com";

-            const string subject = "Test Subject";

-            const string textBody = "Test Text Body";

-            const string htmlBody = "<p>Test HTML Body</p>";

-            const string headerKey = "headerkey";

-            var testHeader = new Dictionary<string, string> { { headerKey, "headervalue" } };

-            const string categoryName = "Example Category";

-

-            var message = new SendGridMessage();

-            message.AddTo(toAddress);

-            message.AddCc(ccAddress);

-            message.Bcc = bccAddresses;

-            message.From = new MailAddress(fromAddress);

-            message.Subject = subject;

-            message.Text = textBody;

-            message.Html = htmlBody;

-            message.AddHeaders(testHeader);

-            message.Header.SetCategory(categoryName);

-

-            var result = webApi.FetchFormParams(message);

-            if (credentials)

-            {

-                Assert.True(result.Any(r => r.Key == "api_user" && r.Value == TestUsername));

-                Assert.True(result.Any(r => r.Key == "api_key" && r.Value == TestPassword));

-            }

-            Assert.True(result.Any(r => r.Key == "to[]" && r.Value == toAddress));

-            Assert.True(result.Any(r => r.Key == "cc[]" && r.Value == ccAddress));

-            Assert.True(result.Any(r => r.Key == "bcc[]" && r.Value == bcc1Address));

-            Assert.True(result.Any(r => r.Key == "bcc[]" && r.Value == bcc2Address));

-            Assert.True(result.Any(r => r.Key == "from" && r.Value == fromAddress));

-            Assert.True(result.Any(r => r.Key == "subject" && r.Value == subject));

-            Assert.True(result.Any(r => r.Key == "text" && r.Value == textBody));

-            Assert.True(result.Any(r => r.Key == "html" && r.Value == htmlBody));

-            Assert.True(

-                result.Any(

-                    r => r.Key == "headers" && r.Value == String.Format("{{\"{0}\":\"{1}\"}}", headerKey, testHeader[headerKey])));

-            Assert.True(

-                result.Any(r => r.Key == "x-smtpapi" && r.Value == String.Format("{{\"category\" : \"{0}\"}}", categoryName)));

-        }

-    }

-}

diff --git a/SendGrid/Tests/app.config b/SendGrid/Tests/app.config
deleted file mode 100644
index 199cd2d..0000000
--- a/SendGrid/Tests/app.config
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<configuration>

-  <runtime>

-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

-      <dependentAssembly>

-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />

-      </dependentAssembly>

-    </assemblyBinding>

-  </runtime>

-  <startup>

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

-  </startup>

-</configuration>
\ No newline at end of file
diff --git a/SendGrid/Tests/packages.config b/SendGrid/Tests/packages.config
deleted file mode 100644
index 8b08e52..0000000
--- a/SendGrid/Tests/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<packages>

-  <package id="Moq" version="4.2.1402.2112" targetFramework="net4" />

-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />

-  <package id="NUnit" version="2.6.3" targetFramework="net4" />

-  <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />

-  <package id="SendGrid.SmtpApi" version="1.3.1" targetFramework="net45" />

-</packages>
\ No newline at end of file
diff --git a/SendGrid/Tests/sendgrid-csharp.snk b/SendGrid/Tests/sendgrid-csharp.snk
deleted file mode 100644
index aff2944..0000000
--- a/SendGrid/Tests/sendgrid-csharp.snk
+++ /dev/null