Skip to content

Commit e234914

Browse files
committed
Update Unit Testing and Nugets
1 parent 147b822 commit e234914

File tree

10 files changed

+310
-275
lines changed

10 files changed

+310
-275
lines changed

Unosquare.Labs.EmbedIO.Samples/Unosquare.Labs.EmbedIO.Samples.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<Private>True</Private>
4848
</Reference>
4949
<Reference Include="Unosquare.Tubular, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Tubular.ServerSide.0.9.7\lib\net45\Unosquare.Tubular.dll</HintPath>
50+
<HintPath>..\packages\Tubular.ServerSide.0.9.14\lib\net45\Unosquare.Tubular.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
5353
</ItemGroup>

Unosquare.Labs.EmbedIO.Samples/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<packages>
33
<package id="log4net" version="2.0.3" targetFramework="net45" />
44
<package id="System.Linq.Dynamic" version="1.0.4" targetFramework="net45" />
5-
<package id="Tubular" version="0.9.11" targetFramework="net45" />
6-
<package id="Tubular.ServerSide" version="0.9.7" targetFramework="net45" />
5+
<package id="Tubular" version="0.9.17" targetFramework="net45" />
6+
<package id="Tubular.ServerSide" version="0.9.14" targetFramework="net45" />
77
</packages>

Unosquare.Labs.EmbedIO.Tests/FluentTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void FluentWithWebApi()
4848

4949
Assert.AreEqual(webServer.Modules.Count, 1, "It has 1 modules loaded");
5050
Assert.IsNotNull(webServer.Module<WebApiModule>(), "It has WebApiModule");
51-
Assert.AreEqual(webServer.Module<WebApiModule>().ControllersCount, 1, "It has one controller");
51+
Assert.AreEqual(webServer.Module<WebApiModule>().ControllersCount, 2, "It has two controllers");
5252

5353
webServer.Dispose();
5454
}
@@ -74,7 +74,7 @@ public void FluentLoadWebApiControllers()
7474

7575
Assert.AreEqual(webServer.Modules.Count, 1, "It has 1 modules loaded");
7676
Assert.IsNotNull(webServer.Module<WebApiModule>(), "It has WebApiModule");
77-
Assert.AreEqual(webServer.Module<WebApiModule>().ControllersCount, 1, "It has one controller");
77+
Assert.AreEqual(webServer.Module<WebApiModule>().ControllersCount, 2, "It has two controllers");
7878

7979
webServer.Dispose();
8080
}

Unosquare.Labs.EmbedIO.Tests/TestObjects/TestController.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,20 @@ public bool PostPeople(WebServer server, HttpListenerContext context)
7474
}
7575
}
7676
}
77+
78+
public class TestControllerWithConstructor : WebApiController
79+
{
80+
public string WebName { get; set; }
81+
82+
public TestControllerWithConstructor(string name)
83+
{
84+
WebName = name;
85+
}
86+
87+
[WebApiHandler(HttpVerbs.Get, "/name")]
88+
public bool GetPeople(WebServer server, HttpListenerContext context)
89+
{
90+
return context.JsonResponse(WebName);
91+
}
92+
}
7793
}

Unosquare.Labs.EmbedIO.Tests/Unosquare.Labs.EmbedIO.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
33+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34+
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
3535
<Private>True</Private>
3636
</Reference>
3737
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

Unosquare.Labs.EmbedIO.Tests/WebApiModuleTest.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,25 @@ public void PostJsonData()
102102
}
103103
}
104104

105+
[Test]
106+
public void TestWebApiWithConstructor()
107+
{
108+
const string name = "Test";
109+
110+
WebServer.Module<WebApiModule>().RegisterController(() => new TestControllerWithConstructor(name));
111+
112+
var request = (HttpWebRequest) WebRequest.Create(Resources.ServerAddress + "name");
113+
114+
using (var response = (HttpWebResponse) request.GetResponse())
115+
{
116+
Assert.AreEqual(response.StatusCode, HttpStatusCode.OK, "Status Code OK");
117+
118+
var body = new StreamReader(response.GetResponseStream()).ReadToEnd();
119+
120+
Assert.AreEqual(body, name);
121+
}
122+
}
123+
105124
[TearDown]
106125
public void Kill()
107126
{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
3+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
44
<package id="NUnit" version="2.6.4" targetFramework="net45" />
55
</packages>

0 commit comments

Comments
 (0)