Grouped tests, converted some to avalonia facts

ChaosDavos · ChaosDavos · commit 1ed8193d07f9 · 2025-03-14T22:19:28.000+01:00
diff --git a/BEAM.Tests/Analysis/PixelAnalysisChannelTests.cs b/BEAM.Tests/Analysis/PixelAnalysisChannelTests.cs
@@ -8,6 +8,7 @@
 
 namespace BEAM.Tests.Analysis;
 
+[Collection("GlobalTests")]
 public class PixelAnalysisChannelTests
 {
     
diff --git a/BEAM.Tests/Analysis/PlotCreatorTests.cs b/BEAM.Tests/Analysis/PlotCreatorTests.cs
@@ -3,6 +3,7 @@
 
 namespace BEAM.Tests.Analysis;
 
+[Collection("GlobalTests")]
 public class PlotCreatorTests
 {
     [Fact]
diff --git a/BEAM.Tests/Analysis/RegionAnalysisAverageOfChannelTests.cs b/BEAM.Tests/Analysis/RegionAnalysisAverageOfChannelTests.cs
@@ -7,6 +7,7 @@
 
 namespace BEAM.Tests.Analysis;
 
+[Collection("GlobalTests")]
 public class RegionAnalysisAverageOfChannelsTests
 {
     private readonly ITestOutputHelper _testOutputHelper;
diff --git a/BEAM.Tests/Analysis/RegionAnalysisStandardDeviationOfChannelsTests.cs b/BEAM.Tests/Analysis/RegionAnalysisStandardDeviationOfChannelsTests.cs
@@ -4,13 +4,10 @@ namespace BEAM.Tests.Analysis;
 using BEAM.Datatypes;
 using BEAM.ImageSequence;
 using BEAM.Analysis;
-using ScottPlot;
 using Xunit;
-using Moq;
-using NP.Utilities;
 using ScottPlot.Plottables;
-using Xunit.Abstractions;
 
+[Collection("GlobalTests")]
 public class RegionAnalysisStandardDerivationOfChannelsTests
 {
 
diff --git a/BEAM.Tests/Controls/ChannelHSVMapTests.cs b/BEAM.Tests/Controls/ChannelHSVMapTests.cs
@@ -4,6 +4,7 @@ namespace BEAM.Tests.Controls;
 using BEAM.Controls;
 using Xunit;
 
+[Collection("GlobalTests")]
 public class ChannelHSVMapTests
 {
     [Fact]
diff --git a/BEAM.Tests/Exporter/EnviExporterTests.cs b/BEAM.Tests/Exporter/EnviExporterTests.cs
@@ -9,7 +9,7 @@
 
 namespace BEAM.Tests.Exporter;
 
-[Collection("ExporterTests")]
+[Collection("GlobalTests")]
 public class EnviExporterTests
 {
     [Fact]
diff --git a/BEAM.Tests/Exporter/PngExporterTests.cs b/BEAM.Tests/Exporter/PngExporterTests.cs
@@ -10,7 +10,7 @@
 
 namespace BEAM.Tests.Exporter;
 
-[Collection("ExporterTests")]
+[Collection("GlobalTests")]
 public class PngExporterTests
 {
     private readonly ITestOutputHelper _testOutputHelper;
diff --git a/BEAM.Tests/Image/Bitmap/BgraBitmapTests.cs b/BEAM.Tests/Image/Bitmap/BgraBitmapTests.cs
@@ -6,6 +6,7 @@ namespace BEAM.Tests.Image.Bitmap;
 using System;
 using System.Runtime.InteropServices;
 
+[Collection("GlobalTests")]
 public class BgraBitmapTests
 {
     [Fact]
diff --git a/BEAM.Tests/Image/Envi/EnviExtensionsTest.cs b/BEAM.Tests/Image/Envi/EnviExtensionsTest.cs
@@ -6,6 +6,7 @@ namespace BEAM.Tests.Image.Envi;
 using System;
 using Xunit;
 
+[Collection("GlobalTests")]
 public class EnviExtensionsTests
 {
     [Fact]
diff --git a/BEAM.Tests/Image/ImageShapeTests.cs b/BEAM.Tests/Image/ImageShapeTests.cs
@@ -3,6 +3,7 @@ namespace BEAM.Tests.Image;
 using BEAM.Image;
 using Xunit;
 
+[Collection("GlobalTests")]
 public class ImageShapeTests
 {
     [Fact]
diff --git a/BEAM.Tests/Image/LineImageTests.cs b/BEAM.Tests/Image/LineImageTests.cs
@@ -3,7 +3,7 @@
 namespace BEAM.Tests.Image;
 
 using Xunit;
-
+[Collection("GlobalTests")]
 public class LineImageTests
 {
     [Fact]
diff --git a/BEAM.Tests/Image/Minimap/MinimapAlgorithms/PixelSumAlgorithmTests.cs b/BEAM.Tests/Image/Minimap/MinimapAlgorithms/PixelSumAlgorithmTests.cs
@@ -6,6 +6,7 @@
 
 namespace BEAM.Tests.Image.Minimap.MinimapAlgorithms;
 
+[Collection("GlobalTests")]
 public class PixelSumAlgorithmTests
 {
     [Fact]
diff --git a/BEAM.Tests/Image/Skia/SkiaImageExtensionTests.cs b/BEAM.Tests/Image/Skia/SkiaImageExtensionTests.cs
@@ -7,6 +7,7 @@ namespace BEAM.Tests.Image.Skia;
 using Xunit;
 using System;
 
+[Collection("GlobalTests")]
 public class SkiaImageExtensionsTests
 {
     [Fact]
diff --git a/BEAM.Tests/ImageSequence/DiskSequenceTests.cs b/BEAM.Tests/ImageSequence/DiskSequenceTests.cs
@@ -7,6 +7,7 @@ namespace BEAM.Tests.ImageSequence;
 /// <summary>
 /// Test for the class 
 /// </summary>
+[Collection("GlobalTests")]
 public class DiskSequenceTests
 {
     private readonly ITestOutputHelper _testOutputHelper;
diff --git a/BEAM.Tests/ImageSequence/EnviSequence.cs b/BEAM.Tests/ImageSequence/EnviSequence.cs
@@ -8,6 +8,7 @@
 
 namespace BEAM.Tests.ImageSequence;
 
+[Collection("GlobalTests")]
 public class EnviSequenceTests
 {
     private readonly ITestOutputHelper _testOutputHelper;
diff --git a/BEAM.Tests/ImageSequence/SequenceShapeTests.cs b/BEAM.Tests/ImageSequence/SequenceShapeTests.cs
@@ -2,7 +2,7 @@
 
 namespace BEAM.Tests.ImageSequence;
 using Xunit;
-
+[Collection("GlobalTests")]
 public class SequenceShapeTests
 {
     [Fact]
diff --git a/BEAM.Tests/ImageSequence/SequenceTests.cs b/BEAM.Tests/ImageSequence/SequenceTests.cs
@@ -3,6 +3,7 @@
 
 namespace BEAM.Tests.ImageSequence;
 
+[Collection("GlobalTests")]
 public class SequenceTests
 {
     class ValueSequence(int width, int height, int channels, double value) : ISequence
diff --git a/BEAM.Tests/ImageSequence/SkiaSequenceTests.cs b/BEAM.Tests/ImageSequence/SkiaSequenceTests.cs
@@ -8,6 +8,7 @@
 
 namespace BEAM.Tests.ImageSequence;
 
+[Collection("GlobalTests")]
 public class SkiaSequenceTests
 {
     private readonly ITestOutputHelper _testOutputHelper;
diff --git a/BEAM.Tests/ImageSequence/Synchronisation/Manipulators/EventSourceMapperTests.cs b/BEAM.Tests/ImageSequence/Synchronisation/Manipulators/EventSourceMapperTests.cs
@@ -1,3 +1,4 @@
+using Avalonia.Headless.XUnit;
 using BEAM.ImageSequence.Synchronization.Manipulators;
 
 namespace BEAM.Tests.ImageSequence.Synchronisation.Manipulators;
@@ -6,9 +7,10 @@ namespace BEAM.Tests.ImageSequence.Synchronisation.Manipulators;
 using ScottPlot.Avalonia;
 using Xunit;
 
+[Collection("GlobalTests")]
 public class EventSourceMapperTests
 {
-    [Fact]
+    [AvaloniaFact]
     public void AddEventSource_AddsEventAndSource()
     {
         var eventSource = new RoutedEventArgs();
@@ -19,7 +21,7 @@ public void AddEventSource_AddsEventAndSource()
         Assert.True(EventSourceMapper.IsSource(eventSource, plot));
     }
 
-    [Fact]
+    [AvaloniaFact]
     public void AddEventSource_LimitExceeded()
     {
         for (int i = 0; i < 100; i++)
@@ -47,7 +49,7 @@ public void AddEventSource_LimitExceeded()
         Assert.True(EventSourceMapper.IsSource(newEvent, newPlot));
     }
 
-    [Fact]
+    [AvaloniaFact]
     public void IsSource_ReturnsFalse_WhenEventNotMapped()
     {
         var eventSource = new RoutedEventArgs();
@@ -56,7 +58,7 @@ public void IsSource_ReturnsFalse_WhenEventNotMapped()
         Assert.False(EventSourceMapper.IsSource(eventSource, plot));
     }
 
-    [Fact]
+    [AvaloniaFact]
     public void AddIfNotExists_AddsEventAndSource_WhenEventNotMapped()
     {
         var eventSource = new RoutedEventArgs();
@@ -67,7 +69,7 @@ public void AddIfNotExists_AddsEventAndSource_WhenEventNotMapped()
         Assert.True(EventSourceMapper.IsSource(eventSource, plot));
     }
 
-    [Fact]
+    [AvaloniaFact]
     public void AddIfNotExists_DoesNotAddEvent_WhenEventAlreadyMapped()
     {
         var eventSource = new RoutedEventArgs();
@@ -81,7 +83,7 @@ public void AddIfNotExists_DoesNotAddEvent_WhenEventAlreadyMapped()
         Assert.False(EventSourceMapper.IsSource(eventSource, plot2));
     }
 
-    [Fact]
+    [AvaloniaFact]
     public void Clear_RemovesAllEventsAndSources()
     {
         var eventSource = new RoutedEventArgs();
diff --git a/BEAM.Tests/Minimap/MinimapSettingsProviderTest.cs b/BEAM.Tests/Minimap/MinimapSettingsProviderTest.cs
@@ -1,17 +1,19 @@
-﻿using BEAM.Image.Minimap.Utility;
+﻿using Avalonia.Headless.XUnit;
+using BEAM.Image.Minimap.Utility;
 
 namespace BEAM.Tests.Minimap;
 
+[Collection("GlobalTests")]
 public class MinimapSettingsProviderTests
 {
-    [Fact]
+    [AvaloniaFact]
     public void Constructor_ShouldInitializeDefaultMinimaps()
     {
         var provider = new MinimapSettingsProvider();
         Assert.NotEmpty(provider.GetDefaultObjects());
     }
 
-    [Fact]
+    [AvaloniaFact]
     public void GetDefaultObject_ShouldReturnCurrentDefault()
     {
         var provider = new MinimapSettingsProvider();
@@ -20,7 +22,7 @@ public void GetDefaultObject_ShouldReturnCurrentDefault()
         Assert.NotNull(defaultObject);
     }
 
-    [Fact]
+    [AvaloniaFact]
     public void SetDefaultObject_ShouldUpdateCurrentDefault()
     {
         var provider = new MinimapSettingsProvider();
diff --git a/BEAM.Tests/Minimap/MinimapSettingsProviderTestTwo.cs b/BEAM.Tests/Minimap/MinimapSettingsProviderTestTwo.cs
@@ -1,26 +1,28 @@
-﻿using BEAM.Image.Minimap.Utility;
+﻿using Avalonia.Headless.XUnit;
+using BEAM.Image.Minimap.Utility;
 
 namespace BEAM.Tests.Minimap;
 
+[Collection("GlobalTests")]
 public class MinimapSettingsProviderTestsTwo
 {
-    [Fact]
+    [AvaloniaFact]
     public void Constructor_ShouldPopulateDefaultMinimaps()
     {
         var provider = new MinimapSettingsProvider();
         var defaults = provider.GetDefaultObjects();
         Assert.NotEmpty(defaults);
     }
 
-    [Fact]
+    [AvaloniaFact]
     public void GetDefaultObject_ShouldReturnNonNullDefault()
     {
         var provider = new MinimapSettingsProvider();
         var defaultObject = provider.GetDefaultObject();
         Assert.NotNull(defaultObject);
     }
 
-    [Fact]
+    [AvaloniaFact]
     public void SetDefaultObject_ShouldUpdateCurrentDefault()
     {
         var provider = new MinimapSettingsProvider();
@@ -29,7 +31,7 @@ public void SetDefaultObject_ShouldUpdateCurrentDefault()
         Assert.Equal(newDefault, provider.GetDefaultObject());
     }
     
-    [Fact]
+    [AvaloniaFact]
     public void GetDefaultClones_ShouldReturnClonesAndCurrentDefaultClone()
     {
         var provider = new MinimapSettingsProvider();
diff --git a/BEAM.Tests/loggerTests/LoggerTests.cs b/BEAM.Tests/loggerTests/LoggerTests.cs
@@ -2,6 +2,7 @@
 
 namespace BEAM.Tests.loggerTests;
 
+[Collection("GlobalTests")]
 public class LoggerTests
 {
     [Fact]

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace BEAM.Tests.Analysis;`
`10`	`10`
	`11`	`+[Collection("GlobalTests")]`
`11`	`12`	`public class PixelAnalysisChannelTests`
`12`	`13`	`{`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace BEAM.Tests.Analysis;`
`5`	`5`
	`6`	`+[Collection("GlobalTests")]`
`6`	`7`	`public class PlotCreatorTests`
`7`	`8`	`{`
`8`	`9`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace BEAM.Tests.Analysis;`
`9`	`9`
	`10`	`+[Collection("GlobalTests")]`
`10`	`11`	`public class RegionAnalysisAverageOfChannelsTests`
`11`	`12`	`{`
`12`	`13`	`private readonly ITestOutputHelper _testOutputHelper;`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ namespace BEAM.Tests.Controls;`
`4`	`4`	`using BEAM.Controls;`
`5`	`5`	`using Xunit;`
`6`	`6`
	`7`	`+[Collection("GlobalTests")]`
`7`	`8`	`public class ChannelHSVMapTests`
`8`	`9`	`{`
`9`	`10`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace BEAM.Tests.Exporter;`
`11`	`11`
`12`		`-[Collection("ExporterTests")]`
	`12`	`+[Collection("GlobalTests")]`
`13`	`13`	`public class EnviExporterTests`
`14`	`14`	`{`
`15`	`15`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace BEAM.Tests.Exporter;`
`12`	`12`
`13`		`-[Collection("ExporterTests")]`
	`13`	`+[Collection("GlobalTests")]`
`14`	`14`	`public class PngExporterTests`
`15`	`15`	`{`
`16`	`16`	`private readonly ITestOutputHelper _testOutputHelper;`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ namespace BEAM.Tests.Image.Bitmap;`
`6`	`6`	`using System;`
`7`	`7`	`using System.Runtime.InteropServices;`
`8`	`8`
	`9`	`+[Collection("GlobalTests")]`
`9`	`10`	`public class BgraBitmapTests`
`10`	`11`	`{`
`11`	`12`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ namespace BEAM.Tests.Image;`
`3`	`3`	`using BEAM.Image;`
`4`	`4`	`using Xunit;`
`5`	`5`
	`6`	`+[Collection("GlobalTests")]`
`6`	`7`	`public class ImageShapeTests`
`7`	`8`	`{`
`8`	`9`	`[Fact]`