(#102) TestFramework: extract the code from TestUtils

codingteam · Aug 20, 2022 · 37fed71 · 37fed71
1 parent 4966c7e
commit 37fed71
Show file tree

Hide file tree

Showing 22 changed files with 53 additions and 31 deletions.
diff --git a/Emulsion.TestFramework/Emulsion.TestFramework.fsproj b/Emulsion.TestFramework/Emulsion.TestFramework.fsproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="LockedBuffer.fs" />
+    <Compile Include="Logging.fs" />
+    <Compile Include="Waiter.fs" />
+    <Compile Include="TestDataStorage.fs" />
+    <Compile Include="Exceptions.fs" />
+    <Compile Include="TelegramClientMock.fs" />
+    <Compile Include="WebFileStorage.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog.Sinks.XUnit" Version="1.0.8" />
+    <ProjectReference Include="..\Emulsion.Database\Emulsion.Database.fsproj" />
+    <ProjectReference Include="..\Emulsion.Telegram\Emulsion.Telegram.fsproj" />
+  </ItemGroup>
+</Project>
diff --git a/Emulsion.Tests/TestUtils/Exceptions.fs → Emulsion.TestFramework/Exceptions.fs b/Emulsion.Tests/TestUtils/Exceptions.fs → Emulsion.TestFramework/Exceptions.fs
@@ -1,4 +1,4 @@
-module Emulsion.Tests.TestUtils.Exceptions
+module Emulsion.TestFramework.Exceptions
 
 open System
 open Microsoft.EntityFrameworkCore

diff --git a/Emulsion.Tests/TestUtils/LockedBuffer.fs → Emulsion.TestFramework/LockedBuffer.fs b/Emulsion.Tests/TestUtils/LockedBuffer.fs → Emulsion.TestFramework/LockedBuffer.fs
@@ -1,4 +1,4 @@
-namespace Emulsion.Tests.TestUtils
+namespace Emulsion.TestFramework
 
 type LockedBuffer<'T>() =
     let messages = ResizeArray<'T>()

diff --git a/Emulsion.Tests/TestUtils/Logging.fs → Emulsion.TestFramework/Logging.fs b/Emulsion.Tests/TestUtils/Logging.fs → Emulsion.TestFramework/Logging.fs
@@ -1,4 +1,4 @@
-module Emulsion.Tests.TestUtils.Logging
+module Emulsion.TestFramework.Logging
 
 open Serilog
 open Xunit.Abstractions

diff --git a/...ion.Tests/TestUtils/TelegramClientMock.fs → Emulsion.TestFramework/TelegramClientMock.fs b/...ion.Tests/TestUtils/TelegramClientMock.fs → Emulsion.TestFramework/TelegramClientMock.fs
@@ -1,4 +1,4 @@
-namespace Emulsion.Tests.TestUtils
+namespace Emulsion.TestFramework
 
 open System.Collections.Generic
 

diff --git a/Emulsion.Tests/TestUtils/TestDataStorage.fs → Emulsion.TestFramework/TestDataStorage.fs b/Emulsion.Tests/TestUtils/TestDataStorage.fs → Emulsion.TestFramework/TestDataStorage.fs
@@ -1,4 +1,4 @@
-module Emulsion.Tests.TestUtils.TestDataStorage
+module Emulsion.TestFramework.TestDataStorage
 
 open System.IO
 

diff --git a/Emulsion.Tests/TestUtils/Waiter.fs → Emulsion.TestFramework/Waiter.fs b/Emulsion.Tests/TestUtils/Waiter.fs → Emulsion.TestFramework/Waiter.fs
@@ -1,4 +1,4 @@
-module Emulsion.Tests.TestUtils.Waiter
+module Emulsion.TestFramework.Waiter
 
 open System
 open System.Threading

diff --git a/Emulsion.Tests/TestUtils/WebFileStorage.fs → Emulsion.TestFramework/WebFileStorage.fs b/Emulsion.Tests/TestUtils/WebFileStorage.fs → Emulsion.TestFramework/WebFileStorage.fs
@@ -1,4 +1,4 @@
-namespace Emulsion.Tests.TestUtils
+namespace Emulsion.TestFramework
 
 open System
 

diff --git a/Emulsion.Tests/Actors/Core.fs b/Emulsion.Tests/Actors/Core.fs
@@ -9,7 +9,7 @@ open Xunit.Abstractions
 open Emulsion
 open Emulsion.Actors
 open Emulsion.Messaging
-open Emulsion.Tests.TestUtils
+open Emulsion.TestFramework
 
 type CoreTests(testOutput: ITestOutputHelper) as this =
     inherit TestKit()

diff --git a/Emulsion.Tests/Actors/Telegram.fs b/Emulsion.Tests/Actors/Telegram.fs
@@ -8,7 +8,7 @@ open Emulsion
 open Emulsion.Actors
 open Emulsion.Messaging
 open Emulsion.Messaging.MessageSystem
-open Emulsion.Tests.TestUtils
+open Emulsion.TestFramework
 
 type TelegramTest(testOutput: ITestOutputHelper) =
     inherit TestKit()

diff --git a/Emulsion.Tests/Actors/Xmpp.fs b/Emulsion.Tests/Actors/Xmpp.fs
@@ -8,7 +8,7 @@ open Emulsion
 open Emulsion.Actors
 open Emulsion.Messaging
 open Emulsion.Messaging.MessageSystem
-open Emulsion.Tests.TestUtils
+open Emulsion.TestFramework
 
 type XmppTest(testOutput: ITestOutputHelper) =
     inherit TestKit()

diff --git a/Emulsion.Tests/ContentProxy/ContentStorageTests.fs b/Emulsion.Tests/ContentProxy/ContentStorageTests.fs
@@ -4,7 +4,7 @@ open Xunit
 
 open Emulsion.ContentProxy.ContentStorage
 open Emulsion.Database
-open Emulsion.Tests.TestUtils
+open Emulsion.TestFramework
 
 let private testIdentity = {
     ChatUserName = "test"

diff --git a/Emulsion.Tests/ContentProxy/FileCacheTests.fs b/Emulsion.Tests/ContentProxy/FileCacheTests.fs
@@ -11,8 +11,8 @@ open Xunit.Abstractions
 
 open Emulsion.ContentProxy
 open Emulsion.Settings
-open Emulsion.Tests.TestUtils
-open Emulsion.Tests.TestUtils.Logging
+open Emulsion.TestFramework
+open Emulsion.TestFramework.Logging
 
 type FileCacheTests(outputHelper: ITestOutputHelper) =
 

diff --git a/Emulsion.Tests/Database/DatabaseStructureTests.fs b/Emulsion.Tests/Database/DatabaseStructureTests.fs
@@ -5,7 +5,7 @@ open Xunit
 
 open Emulsion.Database
 open Emulsion.Database.Entities
-open Emulsion.Tests.TestUtils
+open Emulsion.TestFramework
 
 [<Fact>]
 let ``Unique constraint should hold``(): unit =

diff --git a/Emulsion.Tests/Emulsion.Tests.fsproj b/Emulsion.Tests/Emulsion.Tests.fsproj
@@ -4,13 +4,6 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="TestUtils\LockedBuffer.fs" />
-    <Compile Include="TestUtils\Logging.fs" />
-    <Compile Include="TestUtils\Waiter.fs" />
-    <Compile Include="TestUtils\TestDataStorage.fs" />
-    <Compile Include="TestUtils\Exceptions.fs" />
-    <Compile Include="TestUtils\TelegramClientMock.fs" />
-    <Compile Include="TestUtils\WebFileStorage.fs" />
     <Compile Include="ExceptionUtilsTests.fs" />
     <Compile Include="LifetimesTests.fs" />
     <Compile Include="MessageSenderTests.fs" />
@@ -42,10 +35,10 @@
     <PackageReference Include="Akka.TestKit.Xunit2" Version="1.3.12" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="Serilog.Sinks.TestCorrelator" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.XUnit" Version="1.0.8" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <ProjectReference Include="../Emulsion/Emulsion.fsproj" />
     <ProjectReference Include="..\Emulsion.Database\Emulsion.Database.fsproj" />
+    <ProjectReference Include="..\Emulsion.TestFramework\Emulsion.TestFramework.fsproj" />
   </ItemGroup>
 </Project>
diff --git a/Emulsion.Tests/MessageSenderTests.fs b/Emulsion.Tests/MessageSenderTests.fs
@@ -11,8 +11,8 @@ open Xunit.Abstractions
 
 open Emulsion.Messaging
 open Emulsion.Messaging.MessageSender
-open Emulsion.Tests.TestUtils
-open Emulsion.Tests.TestUtils.Waiter
+open Emulsion.TestFramework
+open Emulsion.TestFramework.Waiter
 
 type MessageSenderTests(testOutput: ITestOutputHelper) =
     let testContext = {

diff --git a/Emulsion.Tests/MessageSystemTests/MessageSystemBaseTests.fs b/Emulsion.Tests/MessageSystemTests/MessageSystemBaseTests.fs
@@ -10,8 +10,8 @@ open Xunit.Abstractions
 open Emulsion
 open Emulsion.Messaging
 open Emulsion.Messaging.MessageSystem
-open Emulsion.Tests.TestUtils
-open Emulsion.Tests.TestUtils.Waiter
+open Emulsion.TestFramework
+open Emulsion.TestFramework.Waiter
 
 type MessageSystemBaseTests(testLogger: ITestOutputHelper) =
     let logger = Logging.xunitLogger testLogger

diff --git a/Emulsion.Tests/Telegram/LinkGeneratorTests.fs b/Emulsion.Tests/Telegram/LinkGeneratorTests.fs
@@ -10,7 +10,7 @@ open Xunit
 open Emulsion.Database
 open Emulsion.Settings
 open Emulsion.Telegram
-open Emulsion.Tests.TestUtils
+open Emulsion.TestFramework
 
 let private hostingSettings = {
     ExternalUriBase = Uri "https://example.com"

diff --git a/Emulsion.Tests/Web/ContentControllerTests.fs b/Emulsion.Tests/Web/ContentControllerTests.fs
@@ -14,8 +14,8 @@ open Emulsion.Database
 open Emulsion.Database.Entities
 open Emulsion.Settings
 open Emulsion.Telegram
-open Emulsion.Tests.TestUtils
-open Emulsion.Tests.TestUtils.Logging
+open Emulsion.TestFramework
+open Emulsion.TestFramework.Logging
 open Emulsion.Web
 
 type ContentControllerTests(output: ITestOutputHelper) =

diff --git a/Emulsion.Tests/Xmpp/EmulsionXmppTests.fs b/Emulsion.Tests/Xmpp/EmulsionXmppTests.fs
@@ -14,7 +14,7 @@ open Xunit.Abstractions
 open Emulsion
 open Emulsion.Messaging
 open Emulsion.Settings
-open Emulsion.Tests.TestUtils
+open Emulsion.TestFramework
 open Emulsion.Tests.Xmpp
 open Emulsion.Xmpp
 open Emulsion.Xmpp.SharpXmppHelper.Elements

diff --git a/Emulsion.Tests/Xmpp/XmppClientRoomTests.fs b/Emulsion.Tests/Xmpp/XmppClientRoomTests.fs
@@ -14,7 +14,7 @@ open Emulsion
 open Emulsion.Xmpp
 open Emulsion.Xmpp.SharpXmppHelper.Attributes
 open Emulsion.Xmpp.SharpXmppHelper.Elements
-open Emulsion.Tests.TestUtils.Logging
+open Emulsion.TestFramework.Logging
 
 type XmppClientRoomTests(output: ITestOutputHelper) =
     let logger = xunitLogger output

diff --git a/Emulsion.sln b/Emulsion.sln
@@ -48,6 +48,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Emulsion.Telegram", "Emulsi
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Emulsion.Messaging", "Emulsion.Messaging\Emulsion.Messaging.fsproj", "{C8DC4049-250B-4E84-BC98-CFC0AF1632AF}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Emulsion.TestFramework", "Emulsion.TestFramework\Emulsion.TestFramework.fsproj", "{381D687B-6520-48F1-8AA0-3EDB45654AAC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -89,6 +91,10 @@ Global
 		{C8DC4049-250B-4E84-BC98-CFC0AF1632AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C8DC4049-250B-4E84-BC98-CFC0AF1632AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C8DC4049-250B-4E84-BC98-CFC0AF1632AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{381D687B-6520-48F1-8AA0-3EDB45654AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{381D687B-6520-48F1-8AA0-3EDB45654AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{381D687B-6520-48F1-8AA0-3EDB45654AAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{381D687B-6520-48F1-8AA0-3EDB45654AAC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{7D1ADF47-BF1C-4007-BB9B-08C283044467} = {973131E1-E645-4A50-A0D2-1886A1A8F0C6}