Refactored prototype code slightly

projectgoav · Apr 15, 2016 · d4ac6e8 · d4ac6e8
1 parent 027843c
commit d4ac6e8
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 12 deletions.
diff --git a/E.Deezer.Tests/E.Deezer.Tests.csproj b/E.Deezer.Tests/E.Deezer.Tests.csproj
@@ -68,6 +68,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utils\TestServerTests.cs" />
     <Compile Include="Utils\TestService.cs" />
+    <Compile Include="Utils\TestServiceResponder.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -87,9 +88,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Genre.All.txt.txt" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\GenreAll.txt" />
   </ItemGroup>

diff --git a/E.Deezer.Tests/Properties/AssemblyInfo.cs b/E.Deezer.Tests/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.0.0.54")]
-[assembly: AssemblyFileVersion("1.0.0.54")]
+[assembly: AssemblyVersion("1.0.0.57")]
+[assembly: AssemblyFileVersion("1.0.0.57")]
diff --git a/E.Deezer.Tests/SetupTests.cs b/E.Deezer.Tests/SetupTests.cs
@@ -16,9 +16,11 @@ public class SetupTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
+            Console.WriteLine("Starting up test server...");
+
             ts = new TestService(10024);
 
-            ts.RegisterEndpoint("genre", GenreTest);
+            ts.RegisterEndpoint("genre", TestServiceResponder.GenreAll);
             ts.Start();
 
             Assert.NotNull(ts);
@@ -27,13 +29,10 @@ public void OneTimeSetUp()
         [OneTimeTearDown]
         public void OneTimeTearDown()
         {
+            Console.WriteLine("Stopping test server...");
+
             ts.Stop();
             ts = null;
         }
-
-        private string GenreTest(System.Collections.Generic.Dictionary<string, string> queryString)
-        {
-            return Resources.GenreAll;
-        }
     }
 }
diff --git a/E.Deezer.Tests/Utils/TestServer.cs b/E.Deezer.Tests/Utils/TestServer.cs
@@ -32,9 +32,10 @@ public WebServer(Func<HttpListenerRequest, string> method, params string[] prefi
 
         public void Run()
         {
+            Console.WriteLine("Webserver starting...");
+
             ThreadPool.QueueUserWorkItem((o) =>
             {
-                Console.WriteLine("Webserver running...");
                 try
                 {
                     while (_listener.IsListening)
@@ -68,8 +69,12 @@ public void Run()
 
         public void Stop()
         {
+            Console.WriteLine("Webserver stopping...");
+
             _listener.Stop();
             _listener.Close();
+
+            Console.WriteLine("Webserver stopped.");
         }
     }
 }
diff --git a/E.Deezer.Tests/Utils/TestServiceResponder.cs b/E.Deezer.Tests/Utils/TestServiceResponder.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+
+using E.Deezer.Tests.Properties;
+
+namespace E.Deezer.Tests.Utils
+{
+    public static class TestServiceResponder
+    {
+        public static string GenreAll(Dictionary<string, string> queryString)
+        {
+            return Resources.GenreAll;
+        }
+
+    }
+}