SMI · rkm · Nov 24, 2024 · Nov 24, 2024 · Nov 24, 2024
diff --git a/news/2023-change.md b/news/2023-change.md
@@ -0,0 +1 @@
+Centralise test logging setup into LoggingFixture
diff --git a/tests/SmiServices.IntegrationTests/Applications/ExtractImages/ExtractImagesHostTests.cs b/tests/SmiServices.IntegrationTests/Applications/ExtractImages/ExtractImagesHostTests.cs
@@ -23,7 +23,6 @@ public class ExtractImagesHostTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/tests/SmiServices.IntegrationTests/Common/HeaderPreservationTest.cs b/tests/SmiServices.IntegrationTests/Common/HeaderPreservationTest.cs
@@ -15,7 +15,6 @@ public class HeaderPreservationTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [Test]

diff --git a/tests/SmiServices.IntegrationTests/Common/Messaging/RabbitMQBrokerTests.cs b/tests/SmiServices.IntegrationTests/Common/Messaging/RabbitMQBrokerTests.cs
@@ -32,7 +32,6 @@ public class RabbitMQBrokerTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
             _testOptions = new GlobalOptionsFactory().Load(nameof(RabbitMQBrokerTests));
 
             _testProducerOptions = new ProducerOptions

diff --git a/tests/SmiServices.IntegrationTests/Common/MongoDB/MongoQueryParserTests.cs b/tests/SmiServices.IntegrationTests/Common/MongoDB/MongoQueryParserTests.cs
@@ -22,7 +22,6 @@ public class MongoQueryParserTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
 
             GlobalOptions globalOptions = new GlobalOptionsFactory().Load(nameof(MongoQueryParserTests));
             _mongoOptions = globalOptions.MongoDatabases!.DicomStoreOptions!;

diff --git a/tests/SmiServices.IntegrationTests/FixtureSetup.cs b/tests/SmiServices.IntegrationTests/FixtureSetup.cs
@@ -9,6 +9,8 @@ internal class FixtureSetup
     [OneTimeSetUp]
     public void OneTimeSetUp()
     {
+        UnitTests.LoggerFixture.Setup();
+
         MessageHeader.CurrentProgramName = nameof(IntegrationTests);
     }
 }
diff --git a/...ationTests/Microservices/CohortExtractor/FromCataloguesExtractionRequestFulfillerTests.cs b/...ationTests/Microservices/CohortExtractor/FromCataloguesExtractionRequestFulfillerTests.cs
@@ -30,7 +30,6 @@ protected override void SetUp()
         {
             base.SetUp();
 
-            TestLogger.Setup();
         }
 
 

diff --git a/tests/SmiServices.IntegrationTests/Microservices/CohortPackager/CohortPackagerHostTest.cs b/tests/SmiServices.IntegrationTests/Microservices/CohortPackager/CohortPackagerHostTest.cs
@@ -31,7 +31,6 @@ public class CohortPackagerHostTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/tests/SmiServices.IntegrationTests/Microservices/CohortPackager/ProgramTests.cs b/tests/SmiServices.IntegrationTests/Microservices/CohortPackager/ProgramTests.cs
@@ -25,7 +25,6 @@ internal class ProgramTests
     [OneTimeSetUp]
     public void OneTimeSetUp()
     {
-        TestLogger.Setup();
     }
 
     [OneTimeTearDown]

diff --git a/tests/SmiServices.IntegrationTests/Microservices/DicomAnonymiser/DicomAnonymiserHostTests.cs b/tests/SmiServices.IntegrationTests/Microservices/DicomAnonymiser/DicomAnonymiserHostTests.cs
@@ -34,7 +34,6 @@ public class DicomAnonymiserHostTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/...rvices.IntegrationTests/Microservices/DicomRelationalMapper/DicomRelationalMapperTests.cs b/...rvices.IntegrationTests/Microservices/DicomRelationalMapper/DicomRelationalMapperTests.cs
@@ -37,7 +37,6 @@ public void Setup()
             _helper = new DicomRelationalMapperTestHelper();
             _helper.SetupSuite(db, RepositoryLocator, _globals, typeof(DicomDatasetCollectionSource));
 
-            TestLogger.Setup();
         }
 
         [Test]

diff --git a/...ices.IntegrationTests/Microservices/DicomRelationalMapper/MicroservicesIntegrationTest.cs b/...ices.IntegrationTests/Microservices/DicomRelationalMapper/MicroservicesIntegrationTest.cs
@@ -55,8 +55,6 @@ public class MicroservicesIntegrationTest : DatabaseTests
 
         private void SetupSuite(DiscoveredDatabase server, bool persistentRaw = false, string? modalityPrefix = null)
         {
-            TestLogger.Setup();
-
             _globals = new GlobalOptionsFactory().Load(nameof(MicroservicesIntegrationTest));
 
             _globals.UseTestValues(
@@ -422,7 +420,6 @@ public void IntegrationTest_BumpyRide(DatabaseType databaseType)
         }
         private void RunTest(DirectoryInfo dir, int numberOfExpectedRows, Action<FileSystemOptions>? adjustFileSystemOptions = null)
         {
-            TestLogger.Setup();
             var logger = LogManager.GetLogger("MicroservicesIntegrationTest");
 
             _globals.FileSystemOptions!.FileSystemRoot = TestContext.CurrentContext.TestDirectory;

diff --git a/tests/SmiServices.IntegrationTests/Microservices/FileCopier/FileCopierHostTest.cs b/tests/SmiServices.IntegrationTests/Microservices/FileCopier/FileCopierHostTest.cs
@@ -21,7 +21,6 @@ public class FileCopierHostTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/tests/SmiServices.IntegrationTests/Microservices/IdentifierMapper/IdentifierMapperTests.cs b/tests/SmiServices.IntegrationTests/Microservices/IdentifierMapper/IdentifierMapperTests.cs
@@ -590,8 +590,6 @@ private static DicomFileMessage GetTestDicomFileMessage(Test testCase = Test.Nor
         [Test]
         public void TestIdentifierSwap_ControlQueueRefresh()
         {
-            TestLogger.Setup();
-
             var mockSwapper = new Mock<ISwapIdentifiers>();
 
 

diff --git a/tests/SmiServices.IntegrationTests/Microservices/IsIdentifiable/IsIdentifiableHostTests.cs b/tests/SmiServices.IntegrationTests/Microservices/IsIdentifiable/IsIdentifiableHostTests.cs
@@ -15,7 +15,6 @@ public class IsIdentifiableHostTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         /// <summary>

diff --git a/....IntegrationTests/Microservices/MongoDBPopulator/Processing/ImageMessageProcessorTests.cs b/....IntegrationTests/Microservices/MongoDBPopulator/Processing/ImageMessageProcessorTests.cs
@@ -29,8 +29,6 @@ public class ImageMessageProcessorTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
-
             _helper = new MongoDbPopulatorTestHelper();
             _helper.SetupSuite();
         }

diff --git a/...vices.IntegrationTests/Microservices/MongoDBPopulator/Processing/MessageProcessorTests.cs b/...vices.IntegrationTests/Microservices/MongoDBPopulator/Processing/MessageProcessorTests.cs
@@ -20,8 +20,6 @@ public class MessageProcessorTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
-
             _helper = new MongoDbPopulatorTestHelper();
             _helper.SetupSuite();
         }

diff --git a/...IntegrationTests/Microservices/MongoDBPopulator/Processing/SeriesMessageProcessorTests.cs b/...IntegrationTests/Microservices/MongoDBPopulator/Processing/SeriesMessageProcessorTests.cs
@@ -29,8 +29,6 @@ public class SeriesMessageProcessorTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
-
             _helper = new MongoDbPopulatorTestHelper();
             _helper.SetupSuite();
         }

diff --git a/...miServices.UnitTests/Applications/DicomDirectoryProcessor/AccessionDirectoryListerTest.cs b/...miServices.UnitTests/Applications/DicomDirectoryProcessor/AccessionDirectoryListerTest.cs
@@ -21,7 +21,6 @@ public class AccessionDirectoryListerTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         private static string GetListContent()

diff --git a/tests/SmiServices.UnitTests/Applications/DicomDirectoryProcessor/DicomDirectoryFinderTest.cs b/tests/SmiServices.UnitTests/Applications/DicomDirectoryProcessor/DicomDirectoryFinderTest.cs
@@ -20,7 +20,6 @@ public class DicomDirectoryFinderTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [Test]

diff --git a/tests/SmiServices.UnitTests/Applications/DicomDirectoryProcessor/PacsDirectoryFinderTests.cs b/tests/SmiServices.UnitTests/Applications/DicomDirectoryProcessor/PacsDirectoryFinderTests.cs
@@ -17,7 +17,6 @@ public class PacsDirectoryFinderTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [Test]

diff --git a/...miServices.UnitTests/Applications/DicomDirectoryProcessor/ZipDicomDirectoryFinderTests.cs b/...miServices.UnitTests/Applications/DicomDirectoryProcessor/ZipDicomDirectoryFinderTests.cs
@@ -20,7 +20,6 @@ public class ZipDicomDirectoryFinderTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [Test]

diff --git a/tests/SmiServices.UnitTests/Applications/DynamicRulesTester/ProgramTests.cs b/tests/SmiServices.UnitTests/Applications/DynamicRulesTester/ProgramTests.cs
@@ -20,7 +20,6 @@ public class ProgramTests
     public void OneTimeSetUp()
     {
         SmiCliInit.InitSmiLogging = false;
-        TestLogger.Setup();
     }
 
     [OneTimeTearDown]

diff --git a/tests/SmiServices.UnitTests/Applications/ExtractImages/CohortCsvParserTests.cs b/tests/SmiServices.UnitTests/Applications/ExtractImages/CohortCsvParserTests.cs
@@ -16,7 +16,6 @@ public class CohortCsvParserTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/tests/SmiServices.UnitTests/Applications/ExtractImages/ExtractImagesCliOptionsTests.cs b/tests/SmiServices.UnitTests/Applications/ExtractImages/ExtractImagesCliOptionsTests.cs
@@ -15,7 +15,6 @@ public class ExtractImagesCliOptionsTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/tests/SmiServices.UnitTests/Applications/ExtractImages/ExtractionMessageSenderTests.cs b/tests/SmiServices.UnitTests/Applications/ExtractImages/ExtractionMessageSenderTests.cs
@@ -24,7 +24,6 @@ public class ExtractionMessageSenderTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/tests/SmiServices.UnitTests/Common/EquTests.cs b/tests/SmiServices.UnitTests/Common/EquTests.cs
@@ -12,7 +12,6 @@ public class EquTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/tests/SmiServices.UnitTests/Common/LoggingTests.cs b/tests/SmiServices.UnitTests/Common/LoggingTests.cs
@@ -13,7 +13,6 @@ class LoggingTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/tests/SmiServices.UnitTests/Common/Messages/ExtractedFileStatusMessageTests.cs b/tests/SmiServices.UnitTests/Common/Messages/ExtractedFileStatusMessageTests.cs
@@ -10,7 +10,6 @@ public class ExtractedFileStatusMessageTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/tests/SmiServices.UnitTests/Common/Messages/MessageHeaderTest.cs b/tests/SmiServices.UnitTests/Common/Messages/MessageHeaderTest.cs
@@ -23,7 +23,6 @@ public class MessageHeaderTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/tests/SmiServices.UnitTests/Common/Messaging/ExponentialBackoffProviderTests.cs b/tests/SmiServices.UnitTests/Common/Messaging/ExponentialBackoffProviderTests.cs
@@ -9,7 +9,6 @@ internal class ExponentialBackoffProviderTests
     [OneTimeSetUp]
     public void OneTimeSetUp()
     {
-        TestLogger.Setup();
     }
 
     [Test]

diff --git a/tests/SmiServices.UnitTests/Common/Messaging/ProducerModelTests.cs b/tests/SmiServices.UnitTests/Common/Messaging/ProducerModelTests.cs
@@ -15,7 +15,6 @@ private class TestMessage : IMessage { }
     [OneTimeSetUp]
     public void OneTimeSetUp()
     {
-        TestLogger.Setup();
     }
 
     [Test]

diff --git a/tests/SmiServices.UnitTests/Common/Messaging/StaticBackoffProviderTests.cs b/tests/SmiServices.UnitTests/Common/Messaging/StaticBackoffProviderTests.cs
@@ -8,7 +8,6 @@ internal class StaticBackoffProviderTests
     [OneTimeSetUp]
     public void OneTimeSetUp()
     {
-        TestLogger.Setup();
     }
 
     [Test]

diff --git a/tests/SmiServices.UnitTests/Common/Options/SmiCliInitTests.cs b/tests/SmiServices.UnitTests/Common/Options/SmiCliInitTests.cs
@@ -13,7 +13,6 @@ public class SmiCliInitTests
         public void OneTimeSetUp()
         {
             SmiCliInit.InitSmiLogging = false;
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/tests/SmiServices.UnitTests/Common/TestClassTemplate.cs b/tests/SmiServices.UnitTests/Common/TestClassTemplate.cs
@@ -20,7 +20,6 @@ public class TestClassTemplate
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/tests/SmiServices.UnitTests/FixtureSetup.cs b/tests/SmiServices.UnitTests/FixtureSetup.cs
@@ -9,6 +9,8 @@ internal class FixtureSetup
     [OneTimeSetUp]
     public void OneTimeSetUp()
     {
+        LoggerFixture.Setup();
+
         MessageHeader.CurrentProgramName = nameof(UnitTests);
     }
 }
diff --git a/...miServices.UnitTests/Common/TestLogger.cs → tests/SmiServices.UnitTests/LoggerFixture.cs b/...miServices.UnitTests/Common/TestLogger.cs → tests/SmiServices.UnitTests/LoggerFixture.cs
@@ -2,9 +2,9 @@
 using NLog.Config;
 using NLog.Targets;
 
-namespace SmiServices.UnitTests.Common
+namespace SmiServices.UnitTests
 {
-    public static class TestLogger
+    public static class LoggerFixture
     {
         private const string TestLoggerName = "TestLogger";
 

diff --git a/...Microservices/CohortExtractor/Execution/RequestFulfillers/Dynamic/DynamicRejectorTests.cs b/...Microservices/CohortExtractor/Execution/RequestFulfillers/Dynamic/DynamicRejectorTests.cs
@@ -14,7 +14,6 @@ public class DynamicRejectorTests
     [OneTimeSetUp]
     public void OneTimeSetUp()
     {
-        TestLogger.Setup();
     }
 
     [OneTimeTearDown]

diff --git a/...sts/Microservices/CohortExtractor/Execution/RequestFulfillers/QueryToExecuteResultTest.cs b/...sts/Microservices/CohortExtractor/Execution/RequestFulfillers/QueryToExecuteResultTest.cs
@@ -13,7 +13,6 @@ public class QueryToExecuteResultTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/...s.UnitTests/Microservices/CohortExtractor/Messaging/ExtractionRequestQueueConsumerTest.cs b/...s.UnitTests/Microservices/CohortExtractor/Messaging/ExtractionRequestQueueConsumerTest.cs
@@ -27,7 +27,6 @@ public class ExtractionRequestQueueConsumerTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/...s/SmiServices.UnitTests/Microservices/CohortExtractor/NoSuffixProjectPathResolverTests.cs b/...s/SmiServices.UnitTests/Microservices/CohortExtractor/NoSuffixProjectPathResolverTests.cs
@@ -15,7 +15,6 @@ public class NoSuffixProjectPathResolverTests
         [SetUp]
         public void SetUp()
         {
-            TestLogger.Setup();
             _fileSystem = new MockFileSystem();
         }
 

diff --git a/...ests/Microservices/CohortExtractor/StudySeriesOriginalFilenameProjectPathResolverTests.cs b/...ests/Microservices/CohortExtractor/StudySeriesOriginalFilenameProjectPathResolverTests.cs
@@ -19,7 +19,6 @@ public class StudySeriesOriginalFilenameProjectPathResolverTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/...ervices.UnitTests/Microservices/CohortExtractor/StudySeriesSOPProjectPathResolverTests.cs b/...ervices.UnitTests/Microservices/CohortExtractor/StudySeriesSOPProjectPathResolverTests.cs
@@ -19,7 +19,6 @@ public class StudySeriesSOPProjectPathResolverTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
 
             _requestMessage = new ExtractionRequestMessage
             {

diff --git a/...s/Microservices/CohortPackager/Execution/ExtractJobStorage/CompletedExtractJobInfoTest.cs b/...s/Microservices/CohortPackager/Execution/ExtractJobStorage/CompletedExtractJobInfoTest.cs
@@ -14,7 +14,6 @@ public class CompletedExtractJobInfoTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/....UnitTests/Microservices/CohortPackager/Execution/ExtractJobStorage/ExtractJobInfoTest.cs b/....UnitTests/Microservices/CohortPackager/Execution/ExtractJobStorage/ExtractJobInfoTest.cs
@@ -15,7 +15,6 @@ public class ExtractJobInfoTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/...UnitTests/Microservices/CohortPackager/Execution/ExtractJobStorage/ExtractJobStoreTest.cs b/...UnitTests/Microservices/CohortPackager/Execution/ExtractJobStorage/ExtractJobStoreTest.cs
@@ -19,7 +19,6 @@ public class ExtractJobStoreTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/...vices/CohortPackager/Execution/ExtractJobStorage/ExtractionIdentifierRejectionInfoTest.cs b/...vices/CohortPackager/Execution/ExtractJobStorage/ExtractionIdentifierRejectionInfoTest.cs
@@ -14,7 +14,6 @@ public class ExtractionIdentifierRejectionInfoTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]

diff --git a/...Tests/Microservices/CohortPackager/Execution/ExtractJobStorage/FileAnonFailureInfoTest.cs b/...Tests/Microservices/CohortPackager/Execution/ExtractJobStorage/FileAnonFailureInfoTest.cs
@@ -13,7 +13,6 @@ public class FileAnonFailureInfoTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            TestLogger.Setup();
         }
 
         [OneTimeTearDown]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Centralise test logging setup into LoggingFixture
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ public class HeaderPreservationTest @@
             [OneTimeSetUp]
             public void OneTimeSetUp()
             {
-                TestLogger.Setup();
             }
             [Test]
@@ Expand Down @@