Update Unit Testing and Nugets

unosquare · Jun 22, 2015 · e234914 · e234914
1 parent 147b822
commit e234914
Show file tree

Hide file tree

Showing 10 changed files with 310 additions and 275 deletions.
diff --git a/Unosquare.Labs.EmbedIO.Samples/Unosquare.Labs.EmbedIO.Samples.csproj b/Unosquare.Labs.EmbedIO.Samples/Unosquare.Labs.EmbedIO.Samples.csproj
@@ -47,7 +47,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Unosquare.Tubular, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Tubular.ServerSide.0.9.7\lib\net45\Unosquare.Tubular.dll</HintPath>
+      <HintPath>..\packages\Tubular.ServerSide.0.9.14\lib\net45\Unosquare.Tubular.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/Unosquare.Labs.EmbedIO.Samples/packages.config b/Unosquare.Labs.EmbedIO.Samples/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="log4net" version="2.0.3" targetFramework="net45" />
   <package id="System.Linq.Dynamic" version="1.0.4" targetFramework="net45" />
-  <package id="Tubular" version="0.9.11" targetFramework="net45" />
-  <package id="Tubular.ServerSide" version="0.9.7" targetFramework="net45" />
+  <package id="Tubular" version="0.9.17" targetFramework="net45" />
+  <package id="Tubular.ServerSide" version="0.9.14" targetFramework="net45" />
 </packages>
diff --git a/Unosquare.Labs.EmbedIO.Tests/FluentTest.cs b/Unosquare.Labs.EmbedIO.Tests/FluentTest.cs
@@ -48,7 +48,7 @@ public void FluentWithWebApi()
 
             Assert.AreEqual(webServer.Modules.Count, 1, "It has 1 modules loaded");
             Assert.IsNotNull(webServer.Module<WebApiModule>(), "It has WebApiModule");
-            Assert.AreEqual(webServer.Module<WebApiModule>().ControllersCount, 1, "It has one controller");
+            Assert.AreEqual(webServer.Module<WebApiModule>().ControllersCount, 2, "It has two controllers");
 
             webServer.Dispose();
         }
@@ -74,7 +74,7 @@ public void FluentLoadWebApiControllers()
 
             Assert.AreEqual(webServer.Modules.Count, 1, "It has 1 modules loaded");
             Assert.IsNotNull(webServer.Module<WebApiModule>(), "It has WebApiModule");
-            Assert.AreEqual(webServer.Module<WebApiModule>().ControllersCount, 1, "It has one controller");
+            Assert.AreEqual(webServer.Module<WebApiModule>().ControllersCount, 2, "It has two controllers");
 
             webServer.Dispose();
         }

diff --git a/Unosquare.Labs.EmbedIO.Tests/TestObjects/TestController.cs b/Unosquare.Labs.EmbedIO.Tests/TestObjects/TestController.cs
@@ -74,4 +74,20 @@ public bool PostPeople(WebServer server, HttpListenerContext context)
             }
         }
     }
+
+    public class TestControllerWithConstructor : WebApiController
+    {
+        public string WebName { get; set; }
+
+        public TestControllerWithConstructor(string name)
+        {
+            WebName = name;
+        }
+
+        [WebApiHandler(HttpVerbs.Get, "/name")]
+        public bool GetPeople(WebServer server, HttpListenerContext context)
+        {
+            return context.JsonResponse(WebName);
+        }
+    }
 }
diff --git a/Unosquare.Labs.EmbedIO.Tests/Unosquare.Labs.EmbedIO.Tests.csproj b/Unosquare.Labs.EmbedIO.Tests/Unosquare.Labs.EmbedIO.Tests.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <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.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

diff --git a/Unosquare.Labs.EmbedIO.Tests/WebApiModuleTest.cs b/Unosquare.Labs.EmbedIO.Tests/WebApiModuleTest.cs
@@ -102,6 +102,25 @@ public void PostJsonData()
             }
         }
 
+        [Test]
+        public void TestWebApiWithConstructor()
+        {
+            const string name = "Test";
+
+            WebServer.Module<WebApiModule>().RegisterController(() => new TestControllerWithConstructor(name));
+
+            var request = (HttpWebRequest) WebRequest.Create(Resources.ServerAddress + "name");
+
+            using (var response = (HttpWebResponse) request.GetResponse())
+            {
+                Assert.AreEqual(response.StatusCode, HttpStatusCode.OK, "Status Code OK");
+
+                var body = new StreamReader(response.GetResponseStream()).ReadToEnd();
+
+                Assert.AreEqual(body, name);
+            }
+        }
+
         [TearDown]
         public void Kill()
         {

diff --git a/Unosquare.Labs.EmbedIO.Tests/packages.config b/Unosquare.Labs.EmbedIO.Tests/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
 </packages>