remove unnecessary TestFixture annotations

SMI · Jan 2, 2025 · 18a32ee · 18a32ee
1 parent 0728584
commit 18a32ee
Show file tree

Hide file tree

Showing 31 changed files with 11 additions and 31 deletions.
diff --git a/tests/SmiServices.IntegrationTests/Common/MongoDB/MongoQueryParserTests.cs b/tests/SmiServices.IntegrationTests/Common/MongoDB/MongoQueryParserTests.cs
@@ -9,7 +9,7 @@
 
 namespace SmiServices.IntegrationTests.Common.MongoDB;
 
-[TestFixture, RequiresMongoDb]
+[RequiresMongoDb]
 public class MongoQueryParserTests
 {
     private readonly ILogger _logger = LogManager.GetCurrentClassLogger();

diff --git a/tests/SmiServices.IntegrationTests/Common/OptionsTests.cs b/tests/SmiServices.IntegrationTests/Common/OptionsTests.cs
@@ -6,7 +6,6 @@
 namespace SmiServices.IntegrationTests.Common;
 
 //TODO: Rework these tests. We should assert that every option in GlobalOptions has an entry in default.yaml. Non-required options should be present with a comment
-[TestFixture]
 public class OptionsTests
 {
     [TestCase]

diff --git a/tests/SmiServices.IntegrationTests/Microservices/CohortPackager/CohortPackagerHostTest.cs b/tests/SmiServices.IntegrationTests/Microservices/CohortPackager/CohortPackagerHostTest.cs
@@ -21,7 +21,7 @@
 
 namespace SmiServices.IntegrationTests.Microservices.CohortPackager;
 
-[TestFixture, RequiresMongoDb, RequiresRabbit]
+[RequiresMongoDb, RequiresRabbit]
 public class CohortPackagerHostTest
 {
     private readonly TestDateTimeProvider _dateTimeProvider = new();

diff --git a/tests/SmiServices.IntegrationTests/Microservices/DicomTagReader/DicomTagReaderHostTests.cs b/tests/SmiServices.IntegrationTests/Microservices/DicomTagReader/DicomTagReaderHostTests.cs
@@ -13,7 +13,7 @@
 
 namespace SmiServices.IntegrationTests.Microservices.DicomTagReader;
 
-[TestFixture, RequiresRabbit]
+[RequiresRabbit]
 public class DicomTagReaderHostTests
 {
     private readonly DicomTagReaderTestHelper _helper = new();

diff --git a/...es.IntegrationTests/Microservices/DicomTagReader/Messaging/DicomTagReaderConsumerTests.cs b/...es.IntegrationTests/Microservices/DicomTagReader/Messaging/DicomTagReaderConsumerTests.cs
@@ -11,7 +11,7 @@
 
 namespace SmiServices.IntegrationTests.Microservices.DicomTagReader.Messaging;
 
-[TestFixture, RequiresRabbit]
+[RequiresRabbit]
 public class DicomTagReaderConsumerTests
 {
     private readonly DicomTagReaderTestHelper _helper = new();

diff --git a/tests/SmiServices.IntegrationTests/Microservices/DicomTagReader/TagReaderTests.cs b/tests/SmiServices.IntegrationTests/Microservices/DicomTagReader/TagReaderTests.cs
@@ -14,7 +14,7 @@
 namespace SmiServices.IntegrationTests.Microservices.DicomTagReader;
 
 //TODO Some of these can be tested without RabbitMQ
-[TestFixture, RequiresRabbit]
+[RequiresRabbit]
 public class TagReaderTests
 {
     private readonly DicomTagReaderTestHelper _helper = new();

diff --git a/tests/SmiServices.IntegrationTests/Microservices/IdentifierMapper/IdentifierMapperTests.cs b/tests/SmiServices.IntegrationTests/Microservices/IdentifierMapper/IdentifierMapperTests.cs
@@ -24,7 +24,6 @@
 
 namespace SmiServices.IntegrationTests.Microservices.IdentifierMapper;
 
-[TestFixture]
 [RequiresRelationalDb(DatabaseType.MicrosoftSQLServer)]
 public class IdentifierMapperTests : DatabaseTests
 {

diff --git a/tests/SmiServices.IntegrationTests/Microservices/IsIdentifiable/IsIdentifiableHostTests.cs b/tests/SmiServices.IntegrationTests/Microservices/IsIdentifiable/IsIdentifiableHostTests.cs
@@ -9,7 +9,7 @@
 
 namespace SmiServices.IntegrationTests.Microservices.IsIdentifiable;
 
-[TestFixture, RequiresRabbit]
+[RequiresRabbit]
 public class IsIdentifiableHostTests
 {
     [OneTimeSetUp]

diff --git a/tests/SmiServices.IntegrationTests/Microservices/MongoDBPopulator/MongoDbAdapterTests.cs b/tests/SmiServices.IntegrationTests/Microservices/MongoDBPopulator/MongoDbAdapterTests.cs
@@ -7,7 +7,7 @@
 
 namespace SmiServices.IntegrationTests.Microservices.MongoDBPopulator;
 
-[TestFixture, RequiresMongoDb]
+[RequiresMongoDb]
 public class MongoDbAdapterTests
 {
     private MongoDbPopulatorTestHelper _helper = null!;

diff --git a/.../SmiServices.IntegrationTests/Microservices/MongoDBPopulator/MongoDbPopulatorHostTests.cs b/.../SmiServices.IntegrationTests/Microservices/MongoDBPopulator/MongoDbPopulatorHostTests.cs
@@ -15,7 +15,7 @@
 
 namespace SmiServices.IntegrationTests.Microservices.MongoDBPopulator;
 
-[TestFixture, RequiresMongoDb, RequiresRabbit]
+[RequiresMongoDb, RequiresRabbit]
 public class MongoDbPopulatorHostTests
 {
     private MongoDbPopulatorTestHelper _helper = null!;

diff --git a/....IntegrationTests/Microservices/MongoDBPopulator/Processing/ImageMessageProcessorTests.cs b/....IntegrationTests/Microservices/MongoDBPopulator/Processing/ImageMessageProcessorTests.cs
@@ -17,7 +17,7 @@
 
 namespace SmiServices.IntegrationTests.Microservices.MongoDBPopulator.Processing;
 
-[TestFixture, RequiresMongoDb]
+[RequiresMongoDb]
 public class ImageMessageProcessorTests
 {
     private MongoDbPopulatorTestHelper _helper = null!;

diff --git a/...vices.IntegrationTests/Microservices/MongoDBPopulator/Processing/MessageProcessorTests.cs b/...vices.IntegrationTests/Microservices/MongoDBPopulator/Processing/MessageProcessorTests.cs
@@ -11,7 +11,7 @@
 
 namespace SmiServices.IntegrationTests.Microservices.MongoDBPopulator.Processing;
 
-[TestFixture, RequiresMongoDb]
+[RequiresMongoDb]
 public class MessageProcessorTests
 {
     private MongoDbPopulatorTestHelper _helper = null!;

diff --git a/...IntegrationTests/Microservices/MongoDBPopulator/Processing/SeriesMessageProcessorTests.cs b/...IntegrationTests/Microservices/MongoDBPopulator/Processing/SeriesMessageProcessorTests.cs
@@ -17,7 +17,7 @@
 
 namespace SmiServices.IntegrationTests.Microservices.MongoDBPopulator.Processing;
 
-[TestFixture, RequiresMongoDb]
+[RequiresMongoDb]
 public class SeriesMessageProcessorTests
 {
     private MongoDbPopulatorTestHelper _helper = null!;

diff --git a/...miServices.UnitTests/Applications/DicomDirectoryProcessor/AccessionDirectoryListerTest.cs b/...miServices.UnitTests/Applications/DicomDirectoryProcessor/AccessionDirectoryListerTest.cs
@@ -14,7 +14,6 @@ namespace SmiServices.UnitTests.Applications.DicomDirectoryProcessor;
 /// <summary>
 /// Unit tests for AccessionDirectoryLister
 /// </summary>
-[TestFixture]
 public class AccessionDirectoryListerTest
 {
     [OneTimeSetUp]

diff --git a/tests/SmiServices.UnitTests/Applications/DicomDirectoryProcessor/DicomDirectoryFinderTest.cs b/tests/SmiServices.UnitTests/Applications/DicomDirectoryProcessor/DicomDirectoryFinderTest.cs
@@ -13,7 +13,6 @@ namespace SmiServices.UnitTests.Applications.DicomDirectoryProcessor;
 /// <summary>
 /// Unit tests for BasicDicomDirectoryFinder
 /// </summary>
-[TestFixture]
 public class DicomDirectoryFinderTest
 {
     [OneTimeSetUp]

diff --git a/tests/SmiServices.UnitTests/Applications/DicomDirectoryProcessor/PacsDirectoryFinderTests.cs b/tests/SmiServices.UnitTests/Applications/DicomDirectoryProcessor/PacsDirectoryFinderTests.cs
@@ -10,7 +10,6 @@
 
 namespace SmiServices.UnitTests.Applications.DicomDirectoryProcessor;
 
-[TestFixture]
 public class PacsDirectoryFinderTests
 {
     [OneTimeSetUp]

diff --git a/...miServices.UnitTests/Applications/DicomDirectoryProcessor/ZipDicomDirectoryFinderTests.cs b/...miServices.UnitTests/Applications/DicomDirectoryProcessor/ZipDicomDirectoryFinderTests.cs
@@ -13,7 +13,6 @@ namespace SmiServices.UnitTests.Applications.DicomDirectoryProcessor;
 /// <summary>
 /// Unit tests for ZipDicomDirectoryFinder
 /// </summary>
-[TestFixture]
 public class ZipDicomDirectoryFinderTests
 {
     [OneTimeSetUp]

diff --git a/tests/SmiServices.UnitTests/Common/Messages/MessageHeaderTest.cs b/tests/SmiServices.UnitTests/Common/Messages/MessageHeaderTest.cs
@@ -6,7 +6,6 @@
 
 namespace SmiServices.UnitTests.Common.Messages;
 
-[TestFixture]
 public class MessageHeaderTest
 {
     private readonly Dictionary<string, object> _testProps = new()

diff --git a/tests/SmiServices.UnitTests/Common/MongoDB/MongoDocumentHeadersTests.cs b/tests/SmiServices.UnitTests/Common/MongoDB/MongoDocumentHeadersTests.cs
@@ -9,7 +9,6 @@
 
 namespace SmiServices.UnitTests.Common.MongoDB;
 
-[TestFixture]
 public class MongoDocumentHeadersTests
 {
     [OneTimeSetUp]

diff --git a/tests/SmiServices.UnitTests/Common/MongoDB/MongoModalityGroupsTests.cs b/tests/SmiServices.UnitTests/Common/MongoDB/MongoModalityGroupsTests.cs
@@ -8,7 +8,6 @@
 
 namespace SmiServices.UnitTests.Common.MongoDB;
 
-[TestFixture]
 public class MongoModalityGroupsTests
 {
     [Test]

diff --git a/....UnitTests/Microservices/CohortPackager/Execution/ExtractJobStorage/ExtractJobInfoTest.cs b/....UnitTests/Microservices/CohortPackager/Execution/ExtractJobStorage/ExtractJobInfoTest.cs
@@ -5,7 +5,6 @@
 
 namespace SmiServices.UnitTests.Microservices.CohortPackager.Execution.ExtractJobStorage;
 
-[TestFixture]
 public class ExtractJobInfoTest
 {
     private readonly TestDateTimeProvider _dateTimeProvider = new();

diff --git a/...UnitTests/Microservices/CohortPackager/Execution/ExtractJobStorage/ExtractJobStoreTest.cs b/...UnitTests/Microservices/CohortPackager/Execution/ExtractJobStorage/ExtractJobStoreTest.cs
@@ -10,7 +10,6 @@
 namespace SmiServices.UnitTests.Microservices.CohortPackager.Execution.ExtractJobStorage;
 
 
-[TestFixture]
 public class ExtractJobStoreTest
 {
     #region Fixture Methods 

diff --git a/...s/CohortPackager/Execution/ExtractJobStorage/MongoDB/MongoExtractJobInfoExtensionsTest.cs b/...s/CohortPackager/Execution/ExtractJobStorage/MongoDB/MongoExtractJobInfoExtensionsTest.cs
@@ -11,7 +11,6 @@
 
 namespace SmiServices.UnitTests.Microservices.CohortPackager.Execution.ExtractJobStorage.MongoDB;
 
-[TestFixture]
 public class MongoExtractJobInfoExtensionsTest
 {
     private readonly DateTimeProvider _dateTimeProvider = new TestDateTimeProvider();

diff --git a/...roservices/CohortPackager/Execution/ExtractJobStorage/MongoDB/MongoExtractJobStoreTest.cs b/...roservices/CohortPackager/Execution/ExtractJobStorage/MongoDB/MongoExtractJobStoreTest.cs
@@ -19,7 +19,6 @@
 
 namespace SmiServices.UnitTests.Microservices.CohortPackager.Execution.ExtractJobStorage.MongoDB;
 
-[TestFixture]
 public class MongoExtractJobStoreTest
 {
     private const string ExtractionDatabaseName = "testExtraction";

diff --git a/...ckager/Execution/ExtractJobStorage/MongoDB/ObjectModel/MongoCompletedExtractJobDocTest.cs b/...ckager/Execution/ExtractJobStorage/MongoDB/ObjectModel/MongoCompletedExtractJobDocTest.cs
@@ -11,7 +11,6 @@
 
 namespace SmiServices.UnitTests.Microservices.CohortPackager.Execution.ExtractJobStorage.MongoDB.ObjectModel;
 
-[TestFixture]
 public class MongoCompletedExtractJobDocTest
 {
     private static readonly DateTimeProvider _dateTimeProvider = new TestDateTimeProvider();

diff --git a/...hortPackager/Execution/ExtractJobStorage/MongoDB/ObjectModel/MongoExpectedFilesDocTest.cs b/...hortPackager/Execution/ExtractJobStorage/MongoDB/ObjectModel/MongoExpectedFilesDocTest.cs
@@ -13,7 +13,6 @@
 
 namespace SmiServices.UnitTests.Microservices.CohortPackager.Execution.ExtractJobStorage.MongoDB.ObjectModel;
 
-[TestFixture]
 public class MongoExpectedFilesDocTest
 {
     private readonly DateTimeProvider _dateTimeProvider = new TestDateTimeProvider();

diff --git a/.../CohortPackager/Execution/ExtractJobStorage/MongoDB/ObjectModel/MongoExtractJobDocTest.cs b/.../CohortPackager/Execution/ExtractJobStorage/MongoDB/ObjectModel/MongoExtractJobDocTest.cs
@@ -13,7 +13,6 @@
 
 namespace SmiServices.UnitTests.Microservices.CohortPackager.Execution.ExtractJobStorage.MongoDB.ObjectModel;
 
-[TestFixture]
 public class MongoExtractJobDocTest
 {
     private readonly DateTimeProvider _dateTimeProvider = new TestDateTimeProvider();

diff --git a/...er/Execution/ExtractJobStorage/MongoDB/ObjectModel/MongoExtractionMessageHeaderDocTest.cs b/...er/Execution/ExtractJobStorage/MongoDB/ObjectModel/MongoExtractionMessageHeaderDocTest.cs
@@ -8,7 +8,6 @@
 
 namespace SmiServices.UnitTests.Microservices.CohortPackager.Execution.ExtractJobStorage.MongoDB.ObjectModel;
 
-[TestFixture]
 public class MongoExtractionMessageHeaderDocTest
 {
     #region Fixture Methods 

diff --git a/.../CohortPackager/Execution/ExtractJobStorage/MongoDB/ObjectModel/MongoFileStatusDocTest.cs b/.../CohortPackager/Execution/ExtractJobStorage/MongoDB/ObjectModel/MongoFileStatusDocTest.cs
@@ -11,7 +11,6 @@
 
 namespace SmiServices.UnitTests.Microservices.CohortPackager.Execution.ExtractJobStorage.MongoDB.ObjectModel;
 
-[TestFixture]
 public class MongoFileStatusDocTest
 {
     private readonly TestDateTimeProvider _dateTimeProvider = new();

diff --git a/...s.UnitTests/Microservices/CohortPackager/Execution/JobProcessing/ExtractJobWatcherTest.cs b/...s.UnitTests/Microservices/CohortPackager/Execution/JobProcessing/ExtractJobWatcherTest.cs
@@ -9,7 +9,6 @@
 
 namespace SmiServices.UnitTests.Microservices.CohortPackager.Execution.JobProcessing;
 
-[TestFixture]
 public class ExtractJobWatcherTest
 {
     #region Fixture Methods

diff --git a/...Microservices/MongoDbPopulator/Execution/Processing/ImageMessageProcessorTests_NoMongo.cs b/...Microservices/MongoDbPopulator/Execution/Processing/ImageMessageProcessorTests_NoMongo.cs
@@ -14,7 +14,6 @@
 
 namespace SmiServices.UnitTests.Microservices.MongoDbPopulator.Execution.Processing;
 
-[TestFixture]
 public class ImageMessageProcessorTests_NoMongo
 {
     private GlobalOptions _testOptions = null!;
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ @@
     namespace SmiServices.UnitTests.Common.MongoDB;
-    [TestFixture]
     public class MongoModalityGroupsTests
     {
         [Test]
@@ Expand Down @@