(#147) Web: add tests

codingteam · Jul 2, 2022 · e80e7c5 · e80e7c5
1 parent 9e7305e
commit e80e7c5
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 9 deletions.
diff --git a/Emulsion.Tests/Emulsion.Tests.fsproj b/Emulsion.Tests/Emulsion.Tests.fsproj
@@ -21,7 +21,6 @@
     <Compile Include="Telegram\Html.fs" />
     <Compile Include="Telegram\FunogramTests.fs" />
     <Compile Include="Telegram\LinkGeneratorTests.fs" />
-    <Compile Include="Xmpp\SharpXmppPingHandlerTests.fs" />
     <Compile Include="Xmpp\XmppClientFactory.fs" />
     <Compile Include="Xmpp\XmppMessageFactory.fs" />
     <Compile Include="Xmpp\XmppClientTests.fs" />
@@ -33,6 +32,7 @@
     <Compile Include="Database\DatabaseStructureTests.fs" />
     <Compile Include="ContentProxy\ContentStorageTests.fs" />
     <Compile Include="ContentProxy\ProxyTests.fs" />
+    <Compile Include="Web\ContentControllerTests.fs" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Akka.TestKit" Version="1.3.12" />

diff --git a/Emulsion.Tests/Web/ContentControllerTests.fs b/Emulsion.Tests/Web/ContentControllerTests.fs
@@ -0,0 +1,79 @@
+namespace Emulsion.Tests.Web
+
+open System
+
+open System.Threading.Tasks
+open Emulsion.ContentProxy
+open Microsoft.AspNetCore.Mvc
+open Microsoft.Extensions.Logging
+open Serilog.Extensions.Logging
+open Xunit
+open Xunit.Abstractions
+
+open Emulsion.Database
+open Emulsion.Database.Entities
+open Emulsion.Settings
+open Emulsion.Tests.TestUtils
+open Emulsion.Tests.TestUtils.Logging
+open Emulsion.Web
+
+type ContentControllerTests(output: ITestOutputHelper) =
+
+    let hostingSettings = {
+        BaseUri = Uri "https://example.com/emulsion"
+        HashIdSalt = "test_salt"
+    }
+
+    let logger = xunitLogger output
+
+    let performTestWithPreparation prepareAction testAction = Async.StartAsTask(async {
+        return! TestDataStorage.doWithDatabase(fun databaseSettings -> async {
+            do! prepareAction databaseSettings
+
+            use loggerFactory = new SerilogLoggerFactory(logger)
+            let logger = loggerFactory.CreateLogger<ContentController>()
+            use context = new EmulsionDbContext(databaseSettings.ContextOptions)
+            let controller = ContentController(logger, hostingSettings, context)
+            return! testAction controller
+        })
+    })
+
+    let performTest = performTestWithPreparation(fun _ -> async.Return())
+
+    [<Fact>]
+    member _.``ContentController returns BadRequest on hashId deserialization error``(): Task =
+        performTest (fun controller -> async {
+            let hashId = "z-z-z-z-z"
+            let! result = Async.AwaitTask <| controller.Get hashId
+            Assert.IsType<BadRequestResult> result |> ignore
+        })
+
+    [<Fact>]
+    member _.``ContentController returns NotFound if the content doesn't exist``(): Task =
+        performTest (fun controller -> async {
+            let hashId = Proxy.encodeHashId hostingSettings.HashIdSalt 667L
+            let! result = Async.AwaitTask <| controller.Get hashId
+            Assert.IsType<NotFoundResult> result |> ignore
+        })
+
+    [<Fact>]
+    member _.``ContentController returns a correct result``(): Task =
+        let contentId = 343L
+        let chatUserName = "MySuperExampleChat"
+        let messageId = 777L
+        performTestWithPreparation (fun databaseOptions -> async {
+            use context = new EmulsionDbContext(databaseOptions.ContextOptions)
+            let content = {
+                Id = contentId
+                ChatUserName = chatUserName
+                MessageId = messageId
+                FileId = "foobar"
+            }
+            do! DataStorage.addAsync context.TelegramContents content
+            return! Async.Ignore <| Async.AwaitTask(context.SaveChangesAsync())
+        }) (fun controller -> async {
+            let hashId = Proxy.encodeHashId hostingSettings.HashIdSalt contentId
+            let! result = Async.AwaitTask <| controller.Get hashId
+            let redirect = Assert.IsType<RedirectResult> result
+            Assert.Equal($"https://t.me/{chatUserName}/{string messageId}", redirect.Url)
+        })
diff --git a/...sion.Web/Controllers/ContentController.fs → Emulsion.Web/ContentController.fs b/...sion.Web/Controllers/ContentController.fs → Emulsion.Web/ContentController.fs
@@ -1,6 +1,5 @@
-namespace Emulsion.Web.Controllers
+namespace Emulsion.Web
 
-open System.Globalization
 open System.Threading.Tasks
 
 open Microsoft.AspNetCore.Mvc
@@ -30,12 +29,11 @@ type ContentController(logger: ILogger<ContentController>,
         return
             content
             |> Option.map(fun c ->
-                let url = $"https://t.me/{c.ChatUserName}/{c.MessageId.ToString(CultureInfo.InvariantCulture)}"
+                let url = $"https://t.me/{c.ChatUserName}/{string c.MessageId}"
                 RedirectResult url
             )
     }
 
-
     [<HttpGet>]
     member this.Get(hashId: string): Task<IActionResult> = task {
         match decodeHashId hashId with

diff --git a/Emulsion.Web/Emulsion.Web.fsproj b/Emulsion.Web/Emulsion.Web.fsproj
@@ -5,12 +5,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Controllers\ContentController.fs" />
+    <Compile Include="ContentController.fs" />
     <Compile Include="WebServer.fs" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Emulsion.ContentProxy\Emulsion.ContentProxy.fsproj" />
     <ProjectReference Include="..\Emulsion.Settings\Emulsion.Settings.fsproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+  </ItemGroup>
 </Project>
diff --git a/Emulsion.Web/WebServer.fs b/Emulsion.Web/WebServer.fs
@@ -6,8 +6,6 @@ open System.Threading.Tasks
 open Microsoft.AspNetCore.Builder
 open Microsoft.Extensions.DependencyInjection
 
-open Emulsion.Web.Controllers
-
 let run(baseUri: Uri): Task =
     // TODO: Pass baseUri
     let builder = WebApplication.CreateBuilder()

diff --git a/Emulsion/Emulsion.fsproj b/Emulsion/Emulsion.fsproj
@@ -38,7 +38,7 @@
     <PackageReference Include="JetBrains.Lifetimes" Version="2020.2.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-    <PackageReference Include="Serilog" Version="2.8.0" />
+    <PackageReference Include="Serilog" Version="2.9.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
     <PackageReference Include="SharpXMPP" Version="0.3.0" />