Reintroduce CaptureException_RemoveScreenshot_NotContainsScreenshotAttachmentAsync

Author: jamescrosswell

test/Sentry.Maui.Tests/Sentry.Maui.Tests.csproj

@@ -21,35 +21,4 @@
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
   </ItemGroup>
 
-  <!-- Disable all test files - comment out specific lines to re-enable tests -->
-  <ItemGroup>
-<!--    <Compile Remove="ApiApprovalTests.verify.cs" />-->
-<!--    <Compile Remove="BindableSentryMauiOptionsTests.cs" />-->
-<!--    <Compile Remove="SentryMauiOptionsTests.cs" />-->
-<!--    <Compile Remove="SentryMauiAppBuilderExtensionsTests.cs" />-->
-<!--    <Compile Remove="SentryMauiAppBuilderExtensionsTests.Android.cs" />-->
-<!--    <Compile Remove="SentryMauiAppBuilderExtensionsTests.Cocoa.cs" />-->
-<!--    <Compile Remove="BreadcrumbEventTests.cs" />-->
-<!--    <Compile Remove="MauiNetworkStatusListenerTests.cs" />-->
-
-<!--    <Compile Remove="MauiEventsBinderTests.Application.cs" />-->
-<!--    <Compile Remove="MauiEventsBinderTests.Element.cs" />-->
-<!--    <Compile Remove="MauiEventsBinderTests.Page.cs" />-->
-<!--    <Compile Remove="MauiEventsBinderTests.Shell.cs" />-->
-<!--    <Compile Remove="MauiEventsBinderTests.VisualElement.cs" />-->
-<!--    <Compile Remove="MauiEventsBinderTests.Window.cs" />-->
-<!--    <Compile Remove="MauiEventsBinderTests.cs" />-->
-
-<!--    <Compile Remove="MauiButtonEventsBinderTests.cs" />-->
-<!--    <Compile Remove="MauiImageButtonEventsBinderTests.cs" />-->
-
-<!--    <Compile Remove="MauiGestureRecognizerEventsBinderTests.cs" />-->
-
-<!--    <Compile Remove="MauiVisualElementEventsBinderTests.cs" />-->
-
-<!--    <Compile Remove="SentryMauiLogcatsTests.cs" />-->
-
-    <Compile Remove="SentryMauiScreenshotTests.cs" />
-  </ItemGroup>
-
 </Project>

test/Sentry.Maui.Tests/SentryMauiScreenshotTests.cs

@@ -53,7 +53,7 @@ public async Task CaptureException_WhenAttachScreenshots_ContainsScreenshotAttac
         var builder = _fixture.Builder.UseSentry();
 
         // Act
-        using var app = builder.Build();
+        await using var app = builder.Build();
         var client = app.Services.GetRequiredService<ISentryClient>();
         var sentryId = client.CaptureException(new Exception());
         await client.FlushAsync();
@@ -94,13 +94,11 @@ public async Task CaptureException_RemoveScreenshot_NotContainsScreenshotAttachm
         ));
 
         // Act
-        using var app = builder.Build();
+        await using var app = builder.Build();
         var client = app.Services.GetRequiredService<ISentryClient>();
         var sentryId = client.CaptureException(new Exception());
         await client.FlushAsync();
 
-        var options = app.Services.GetRequiredService<IOptions<SentryMauiOptions>>().Value;
-
         var envelope = _fixture.Transport.GetSentEnvelopes().FirstOrDefault(e => e.TryGetEventId() == sentryId);
         envelope.Should().NotBeNull();
 
@@ -116,22 +114,21 @@ public async Task CaptureException_BeforeCaptureScreenshot_DisableCaptureAsync()
 #if __IOS__
         Skip.If(true, "Flaky on iOS");
 #endif
+#if ANDROID
+        Skip.If(TestEnvironment.IsGitHubActions, "Flaky in CI on Android");
+#endif
 
         // Arrange
-        var builder = _fixture.Builder.UseSentry(options => options.SetBeforeScreenshotCapture((e, hint) =>
-            {
-                return false;
-            }
+        var builder = _fixture.Builder.UseSentry(options => options.SetBeforeScreenshotCapture(
+            (_, _) => false
         ));
 
         // Act
-        using var app = builder.Build();
+        await using var app = builder.Build();
         var client = app.Services.GetRequiredService<ISentryClient>();
         var sentryId = client.CaptureException(new Exception());
         await client.FlushAsync();
 
-        var options = app.Services.GetRequiredService<IOptions<SentryMauiOptions>>().Value;
-
         var envelope = _fixture.Transport.GetSentEnvelopes().FirstOrDefault(e => e.TryGetEventId() == sentryId);
         envelope.Should().NotBeNull();
 
@@ -157,10 +154,8 @@ public async Task CaptureException_BeforeCaptureScreenshot_DefaultAsync()
 #endif
 
         // Arrange
-        var builder = _fixture.Builder.UseSentry(options => options.SetBeforeScreenshotCapture((e, hint) =>
-        {
-            return true;
-        }
+        var builder = _fixture.Builder.UseSentry(options => options.SetBeforeScreenshotCapture(
+            (_, _) => true
         ));
 
         // Act
@@ -184,19 +179,20 @@ public async Task CaptureException_BeforeCaptureScreenshot_DefaultAsync()
         }
         else
         {
-        envelopeItem.Should().NotBeNull();
+            envelopeItem.Should().NotBeNull();
             envelopeItem!.TryGetFileName().Should().Be("screenshot.jpg");
         }
     }
 
-    [Fact]
+    [SkippableFact]
     public async Task CaptureException_AttachScreenshot_Threadsafe()
     {
+#if ANDROID
+        Skip.If(TestEnvironment.IsGitHubActions, "Flaky in CI on Android");
+#endif
+
         // Arrange
-        var builder = _fixture.Builder.UseSentry(options =>
-        {
-            options.AttachScreenshot = true;
-        });
+        var builder = _fixture.Builder.UseSentry(options => options.AttachScreenshot = true);
         await using var app = builder.Build();
         var client = app.Services.GetRequiredService<ISentryClient>();