diff --git a/.forgejo/workflows/buildAndTest.yml b/.forgejo/workflows/buildAndTest.yml index 6106f11f9..12e4d8147 100644 --- a/.forgejo/workflows/buildAndTest.yml +++ b/.forgejo/workflows/buildAndTest.yml @@ -69,10 +69,7 @@ jobs: YAVSC_API_TEST_NPGSQL_ADMIN_CONNECTION: Host=127.0.0.1;Port=55432;Database=postgres;Username=postgres;Password=postgres;Include Error Detail=true run: | echo "🚀 Lancement des tests..." - cd /src/_src && dotnet test \ - --report-xunit \ - --report-xunit-html \ - --report-xunit-html-filename "test-results.html" + cd /src/_src && make test TEST_EXIT_CODE=$? echo "Test exit code: $TEST_EXIT_CODE" if [ $TEST_EXIT_CODE -ne 0 ]; then diff --git a/Makefile b/Makefile index 788c98927..e3fb5b686 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ FRAMEWORK=net9.0 DESTDIR=/tmp/yavsc APP_PATH=srv/www/yavsc APP_FULL_PATH=$(DESTDIR)/$(APP_PATH) +UNITTESTEXTRA= --long-running 8 --filter-trait Category=non-reg --filter-not-trait Speed=Slow --filter-not-trait DependsOn=Native all: dotnet build --nologo @@ -19,30 +20,36 @@ src/Yavsc/bin/output/wwwroot: dotnet --project src/Yavsc.Org/Yavsc.Org.csproj publish test: - ASPNETCORE_ENVIRONMENT=Development dotnet test --report-xunit \ - --report-xunit-html \ - --results-directory "test-reports" + ASPNETCORE_ENVIRONMENT=Development \ + TESTINGPLATFORM_EXITCODE_IGNORE="110;1" \ + dotnet test yavsc.sln \ + -- --report-xunit \ + --report-xunit-html \ + --results-directory "test-reports" \ + $(UNITTESTEXTRA) || EXITCODE=$$? && echo "🗱💻 Tests failed, exited with code $$EXITCODE"; test-postit: - ASPNETCORE_ENVIRONMENT=Development dotnet test \ - --report-xunit \ - --report-xunit-html \ - --results-directory "test-reports" \ - --report-xunit-html-filename "postit-test-results.html" \ - --no-progress \ - --project src/PostIt/PostIt.Tests/PostIt.Tests.csproj + ASPNETCORE_ENVIRONMENT=Development \ + TESTINGPLATFORM_EXITCODE_IGNORE="110;1" \ + dotnet test \ + src/PostIt/PostIt.Tests/PostIt.Tests.csproj \ + -- --report-xunit \ + --report-xunit-html \ + --results-directory "test-reports" \ + --report-xunit-html-filename "postit-test-results.html" \ + $(UNITTESTEXTRA) || EXITCODE=$$? && echo "🗱📱 Tests failed, exited with code $$EXITCODE"; backend-tests: Blogs-backend-test Org-backend-test Api-backend-test Api-backend-test: Blogs-backend-test: Org-backend-test: %-backend-test: - ASPNETCORE_ENVIRONMENT=Development dotnet test \ + ASPNETCORE_ENVIRONMENT=Development dotnet test + src/test/Yavsc.$*.Tests/Yavsc.$*.Tests.csproj \ --report-xunit \ --report-xunit-html \ --results-directory "test-reports" \ - --report-xunit-html-filename "$*-backend-test-results.html" \ - --project src/test/Yavsc.$*.Tests/Yavsc.$*.Tests.csproj + --report-xunit-html-filename "$*-backend-test-results.html" watch: dotnet watch -p:Configuration=$(CONFIG) --project src/Yavsc/Yavsc.csproj diff --git a/doc/plan-test-cleanup.md b/doc/plan-test-cleanup.md new file mode 100644 index 000000000..00bab1aac --- /dev/null +++ b/doc/plan-test-cleanup.md @@ -0,0 +1,173 @@ +# Plan de nettoyage de la suite PostIt + +## Objectif + +Rendre la suite PostIt plus rapide, plus fiable et plus lisible, sans bloquer le développement quotidien par des tests dépendants d’un matériel, d’un binaire externe ou d’un environnement local spécifique. + +## Problème actuel + +La suite a grossi sans vraie séparation entre : + +- tests rapides et déterministes, +- tests UI headless, +- tests d’intégration, +- tests dépendants de l’environnement, +- tests Android / native / device-specific. + +Résultat : la routine par défaut devient bruitée et peu fiable, et les sujets de fond (comportement métier) sont noyés dans des tests exigeants en dépendances système. + +## Plan proposé + +### 1. Séparer la suite par catégorie de dépendance + +Les tests doivent être classés selon leur coût et leur dépendance externe, avec des annotations de classe xUnit du type : + +```csharp +[Trait("Category", "Native")] +[Trait("Category", "Slow")] +public sealed class PodcastNativeCaptureTests +``` + +Et pour les tests Android : + +```csharp +[Trait("Category", "Android")] +public class AndroidAppLaunchTests +``` + + +- Fast unit tests +- Headless UI tests +- Integration tests +- Native / environment-dependent tests +- Android-only tests + +La règle doit être simple : un test ne doit entrer dans la routine par défaut que s’il est exécutable sans matériel, binaire externe ni fichier de test local spécifique. + +### 2. Garder la routine par défaut “portable” + +La suite standard de développement doit couvrir uniquement : + +- les comportements métier, +- les flux UI sans environnement spécifique, +- les tests reproductibles sans dépendances natives. + +Les tests qui exigent : + +- LibVLC, +- ffprobe / codecs, +- fichiers médias locaux, +- Android emulator / adb, +- services device-bound, + +doivent être exclus de la routine standard. + +### 3. Isoler les tests non-portables + +Les tests dépendants de l’environnement doivent être déplacés ou séparés dans une catégorie spécifique, par exemple : + +- `Native` +- `Android` +- `Slow` + +Cela permet de conserver la signalisation de leur objectif sans polluer la suite principale. + +### 4. Nettoyer les doublons fonctionnels + +Les tests qui vérifient le même comportement avec seulement de légères variantes doivent être regroupés, fusionnés ou simplifiés. + +Règle de qualité : + +- 1 test = 1 comportement clair, +- 1 titre = 1 intention claire, +- 1 appel de fonction = 1 vérification utile. + +### 5. Structurer les tests par feature et par niveau + +Exemple de structure suggérée : + +- `PostIt.Tests/Fast/` +- `PostIt.Tests/Headless/` +- `PostIt.Tests/Integration/` +- `PostIt.Tests/Native/` +- `PostIt.Tests/Android/` + +Cette structure permet de distinguer immédiatement les tests de comportement des tests d’infrastructure. + +### 6. Séparer la CI en deux niveaux + +- CI standard / PR : tests rapides + headless +- CI nocturne / full : tests native + Android + integration lourde + +Cela permet d’avoir un cycle de développement rapide sans sacrifier une vraie validation dans les scénarios spécifiques. + +## Catégorisation cible des tests + +Important : les catégories xUnit ne doivent être appliquées qu’aux vraies classes de test. Les `Activity` Android utilisées comme harness de test ne sont pas des classes de test et ne doivent pas porter de `[Trait("Category", ...)]`. + +### Native + +Classes de test xUnit qui dépendent de LibVLC, de fichiers multimédia locaux, de codecs ou d’un support natif Linux/OS spécifique. + +- `LinuxLanCallMediaTests` +- `PodcastNativeCaptureTests` +- `PodcastReplayTests` +- `WebRtcCallViewModelTests` — sous-cas natif activé avec `POSTIT_TEST_NATIVE_WEBRTC=1` + +### Android + +Classes de test xUnit qui tournent sur un contexte Android spécifique, sur `adb`, sur un émulateur ou sur un device Android réel. + +- `AndroidAppLaunchTests` + +### Slow + +Classes de test xUnit lourdes ou lentes, souvent partielles sur le flux média, la capture ou la lecture de données. Elles doivent être explicitement marquées comme `Slow` pour ne pas polluer la suite standard. + +- `PodcastNativeCaptureTests` +- `PodcastReplayTests` +- `LinuxLanCallMediaTests` +- `WebRtcCallViewModelTests` — variante native / réseau / media-heavy + +### Harness Android de support (non test classes) + +Ces classes servent à déclencher un test Android dans un `Activity` dédié, mais elles ne sont pas des classes xUnit de test et ne portent pas de trait de catégorie. + +- `AndroidCameraFrameRotationTestActivity` +- `AndroidChatServiceTestActivity` +- `AndroidLanCallTestActivity` +- `AndroidMarkdownEditorTestActivity` +- `AndroidPodcastBlurTestActivity` +- `AndroidPodcastCaptureTestActivity` +- `AndroidScreenAwakeTestActivity` +- `AndroidWebRtcTestActivity` + +### Tests non-portables à sortir de la routine par défaut + +Les classes de test ci-dessous dépendent d’un environnement local spécifique, d’un binaire externe ou d’un matériel Android / native. Elles ne devraient pas faire partie de la routine quotidienne standard. + +- `AndroidAppLaunchTests` +- `LinuxLanCallMediaTests` +- `PodcastNativeCaptureTests` +- `PodcastReplayTests` +- `WebRtcCallViewModelTests` — cas native spécifique avec `POSTIT_TEST_NATIVE_WEBRTC=1` + +## Exemples de dépendances qui rendent ces tests non-portables + +- `POSTIT_TEST_MEDIA` +- `POSTIT_TEST_TS` +- `POSTIT_TEST_REPLAY` +- `POSTIT_TEST_NATIVE_WEBRTC` +- `adb` / appareil Android connecté +- LibVLC installé avec les codecs nécessaires +- fichiers vidéo/audio locaux +- machines Linux spécifiques + +## État souhaité + +Une suite PostIt propre doit avoir : + +- une routine standard courte et stable, +- des tests natifs clairement isolés, +- une séparation nette des responsabilités, +- un signal de qualité lisible pour les contributeurs. diff --git a/package.json b/package.json index c8d376253..4acd90a5d 100644 --- a/package.json +++ b/package.json @@ -10,22 +10,13 @@ "clean:js": "node esbuild.config.mjs --clean" }, "dependencies": { - "@aspnet/signalr": "^1.0.27", "bootstrap": "^4.6.2", - "dropzone": "^5.9.3", - "eonasdan-bootstrap-datetimepicker": "^4.17.49", - "hls.js": "1.6.13", "jquery": "^3.7.1", - "jquery-timepicker": "^1.3.3", "jquery-ui": "^1.13.3", "jquery-validation": "^1.20.0", - "jquery-validation-unobtrusive": "^4.0.0", - "moment": "^2.30.1", - "quill": "^1.3.7", - "showdown": "^2.1.0", - "to-markdown": "^3.1.1" + "jquery-validation-unobtrusive": "^4.0.0" }, "devDependencies": { - "esbuild": "^0.24.0" + "esbuild": "^0.28.2" } } diff --git a/src/PostIt/PostIt.Tests/AboutTermsTests.cs b/src/PostIt/PostIt.Tests/AboutTermsTests.cs index 3b4a1e7c4..4e133d05e 100644 --- a/src/PostIt/PostIt.Tests/AboutTermsTests.cs +++ b/src/PostIt/PostIt.Tests/AboutTermsTests.cs @@ -2,6 +2,7 @@ using PostIt.ViewModels; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public sealed class AboutTermsTests { [Fact] diff --git a/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs b/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs index 6cac39603..d82ae084b 100644 --- a/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs +++ b/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs @@ -5,6 +5,7 @@ using Yavsc.Api.Client; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public class ActivitiesPageViewModelTests { [Fact] diff --git a/src/PostIt/PostIt.Tests/ActivityNavigationTests.cs b/src/PostIt/PostIt.Tests/ActivityNavigationTests.cs index 607523deb..331a49af0 100644 --- a/src/PostIt/PostIt.Tests/ActivityNavigationTests.cs +++ b/src/PostIt/PostIt.Tests/ActivityNavigationTests.cs @@ -7,6 +7,7 @@ using PostIt.Views; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public class ActivityNavigationTests { [AvaloniaFact] diff --git a/src/PostIt/PostIt.Tests/AddCircleMemberDialogTests.cs b/src/PostIt/PostIt.Tests/AddCircleMemberDialogTests.cs index 8bec1dc60..fa10be0d8 100644 --- a/src/PostIt/PostIt.Tests/AddCircleMemberDialogTests.cs +++ b/src/PostIt/PostIt.Tests/AddCircleMemberDialogTests.cs @@ -2,7 +2,6 @@ using Avalonia; using Avalonia.Headless.XUnit; using Microsoft.Extensions.DependencyInjection; -using PostIt.Helpers; using PostIt.Services; using PostIt.ViewModels; using PostIt.Views; @@ -29,6 +28,7 @@ namespace PostIt.Tests; /// click via button.Command?.Execute(...) + flush /// any async command before asserting. /// +[Trait("Category", "non-reg")] public class AddCircleMemberDialogTests { /// diff --git a/src/PostIt/PostIt.Tests/AdministrationAccessTests.cs b/src/PostIt/PostIt.Tests/AdministrationAccessTests.cs index 30feb7b6e..429e0ac98 100644 --- a/src/PostIt/PostIt.Tests/AdministrationAccessTests.cs +++ b/src/PostIt/PostIt.Tests/AdministrationAccessTests.cs @@ -1,4 +1,3 @@ -using System.Net.Http; using System.Text.Json; using Avalonia.Controls; using Avalonia.Headless.XUnit; @@ -13,6 +12,7 @@ using Yavsc.Api.Client; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public class AdministrationAccessTests { [Fact] @@ -41,44 +41,6 @@ public class AdministrationAccessTests Assert.Contains("les usages restent consultables", model.StatusMessage); } - [AvaloniaTheory] - [InlineData("Moderator", false)] - [InlineData("Administrator", true)] - [InlineData("administrator", false)] - [InlineData("Performer", false)] - [InlineData("moderator", false)] - [InlineData("", false)] - public async Task Home_administration_visibility_and_command_follow_the_administrator_role(string role, bool allowed) - { - await using var api = new ProfileTransport(role); - var session = new SessionStatusViewModel { Api = api }; - var vm = new HomePageViewModel(api, api.Settings, session, null!); - var page = new HomePage { DataContext = vm }; - var window = new Window { Content = page }; - try - { - window.Show(); - var button = Assert.Single(page.GetVisualDescendants().OfType -[Trait("Category", "Platform-Android")] +[Trait("Platform", "Android")] +[Trait("Category", "non-reg")] public class AndroidAppLaunchTests { private const string PackageName = "fr.pschneider.postit"; diff --git a/src/PostIt/PostIt.Tests/BearerScopeTests.cs b/src/PostIt/PostIt.Tests/BearerScopeTests.cs index 984483fc7..4c90b0290 100644 --- a/src/PostIt/PostIt.Tests/BearerScopeTests.cs +++ b/src/PostIt/PostIt.Tests/BearerScopeTests.cs @@ -28,6 +28,7 @@ namespace PostIt.Tests; /// it reaches production. /// /// +[Trait("Category", "non-reg")] public class BearerScopeTests { /// diff --git a/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs b/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs index 34804b4cd..fc508283c 100644 --- a/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs +++ b/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs @@ -10,6 +10,7 @@ using Yavsc.Models.Haircut; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public class BillingCommandPageViewModelTests { [Fact] diff --git a/src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs b/src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs index e53139351..57e841564 100644 --- a/src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs +++ b/src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs @@ -6,6 +6,7 @@ using Yavsc.Api.Client; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public class BillingQueriesPageViewModelTests { [Fact] diff --git a/src/PostIt/PostIt.Tests/BlogAttachmentLinkTests.cs b/src/PostIt/PostIt.Tests/BlogAttachmentLinkTests.cs index c9d7d3aae..60ee78c91 100644 --- a/src/PostIt/PostIt.Tests/BlogAttachmentLinkTests.cs +++ b/src/PostIt/PostIt.Tests/BlogAttachmentLinkTests.cs @@ -18,6 +18,7 @@ namespace PostIt.Tests; /// (relative, authority-less) instead of /// https://{authority}/files/{user}/blogs/{id}/{name}. /// +[Trait("Category", "non-reg")] public class BlogAttachmentLinkTests { [Theory] diff --git a/src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs b/src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs index daabdf59b..205ab7bd4 100644 --- a/src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs +++ b/src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs @@ -28,6 +28,7 @@ namespace PostIt.Tests; /// it actually manifested in production. /// /// +[Trait("Category", "non-reg")] public class BlogPostAuthorDtoTests { private static readonly JsonSerializerOptions CaseInsensitiveJson diff --git a/src/PostIt/PostIt.Tests/BlogReaderTests.cs b/src/PostIt/PostIt.Tests/BlogReaderTests.cs index 0b26cf33e..c40e4c088 100644 --- a/src/PostIt/PostIt.Tests/BlogReaderTests.cs +++ b/src/PostIt/PostIt.Tests/BlogReaderTests.cs @@ -21,6 +21,7 @@ using SkiaSharp; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public class BlogReaderTests { private static BlogPostDto Post(string article = "Texte du billet.") => new() @@ -139,57 +140,6 @@ public class BlogReaderTests } } - [AvaloniaFact] - public async Task Reader_initialization_and_empty_selection_do_not_report_binding_errors() - { - var vm = CreateViewModel(); - await vm.InitializeAsync(); - var post = Post(); - vm.Posts.Add(post); - vm.FilteredPosts.Add(post); - var previousSink = Logger.Sink; - var sink = new RecordingLogSink(); - Logger.Sink = sink; - Window? window = null; - try - { - var page = new BlogsPage(); - var reader = page.FindControl("ArticleReader")!; - var engine = Assert.IsAssignableFrom(reader.Engine); - Assert.NotNull(engine.HyperlinkCommand); - Assert.False(engine.HyperlinkCommand.CanExecute("https://example.test/")); - page.DataContext = vm; - var nav = new NavigationPage(); - await nav.PushAsync(page); - window = new Window { Width = 800, Height = 700, Content = nav }; - window.Show(); - Dispatcher.UIThread.RunJobs(); - Assert.Empty(vm.ReaderTitle); - Assert.Null(vm.ReaderDateModified); - Assert.Same(vm.OpenResourceCommand, engine.HyperlinkCommand); - Assert.IsType(reader.Plugins.PathResolver); - - vm.SelectedPost = post; - Dispatcher.UIThread.RunJobs(); - Assert.Equal(post.Title, vm.ReaderTitle); - Assert.Equal(post.DateModified, vm.ReaderDateModified); - - vm.SelectedPost = null; - page.DataContext = null; - Dispatcher.UIThread.RunJobs(); - Assert.Empty(vm.ReaderTitle); - Assert.Null(vm.ReaderDateModified); - Assert.NotNull(engine.HyperlinkCommand); - Assert.False(engine.HyperlinkCommand.CanExecute("https://example.test/")); - Assert.DoesNotContain(sink.Entries, entry => entry.Area == LogArea.Binding); - } - finally - { - window?.Close(); - Logger.Sink = previousSink; - } - } - [AvaloniaTheory] [InlineData(360, 800, false)] [InlineData(1000, 420, true)] diff --git a/src/PostIt/PostIt.Tests/BlogResourceServiceTests.cs b/src/PostIt/PostIt.Tests/BlogResourceServiceTests.cs index 0682dc6f2..1cb047aa6 100644 --- a/src/PostIt/PostIt.Tests/BlogResourceServiceTests.cs +++ b/src/PostIt/PostIt.Tests/BlogResourceServiceTests.cs @@ -4,6 +4,7 @@ using PostIt.Services; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public class BlogResourceServiceTests { private const string Authority = "https://yavsc.pschneider.fr"; diff --git a/src/PostIt/PostIt.Tests/CallSignalingClientTests.cs b/src/PostIt/PostIt.Tests/CallSignalingClientTests.cs index c3f7945cb..48e9c4dad 100644 --- a/src/PostIt/PostIt.Tests/CallSignalingClientTests.cs +++ b/src/PostIt/PostIt.Tests/CallSignalingClientTests.cs @@ -5,6 +5,7 @@ using Yavsc.Abstract.Chat.Calls; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public sealed class CallSignalingClientTests { [Fact] diff --git a/src/PostIt/PostIt.Tests/CameraFrameClockTests.cs b/src/PostIt/PostIt.Tests/CameraFrameClockTests.cs index 9fbaac067..a5e64e3cd 100644 --- a/src/PostIt/PostIt.Tests/CameraFrameClockTests.cs +++ b/src/PostIt/PostIt.Tests/CameraFrameClockTests.cs @@ -2,6 +2,7 @@ using PostIt.Android.Services; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public sealed class CameraFrameClockTests { [Theory] diff --git a/src/PostIt/PostIt.Tests/CameraFrameOrientationTests.cs b/src/PostIt/PostIt.Tests/CameraFrameOrientationTests.cs index 369d3fd8e..6b9ab89ed 100644 --- a/src/PostIt/PostIt.Tests/CameraFrameOrientationTests.cs +++ b/src/PostIt/PostIt.Tests/CameraFrameOrientationTests.cs @@ -2,6 +2,7 @@ using PostIt.Android.Services; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public sealed class CameraFrameOrientationTests { [Theory] diff --git a/src/PostIt/PostIt.Tests/EstimateEditionPageViewModelTests.cs b/src/PostIt/PostIt.Tests/EstimateEditionPageViewModelTests.cs index 31c82387d..620e6a478 100644 --- a/src/PostIt/PostIt.Tests/EstimateEditionPageViewModelTests.cs +++ b/src/PostIt/PostIt.Tests/EstimateEditionPageViewModelTests.cs @@ -1,4 +1,3 @@ -using System.Net.Http; using PostIt.Models; using PostIt.ViewModels; using Yavsc; @@ -6,6 +5,7 @@ using Yavsc.Api.Client; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public class EstimateEditionPageViewModelTests { private static BillingQuerySummaryDto SampleQuery() => new() diff --git a/src/PostIt/PostIt.Tests/EstimateListPageViewModelTests.cs b/src/PostIt/PostIt.Tests/EstimateListPageViewModelTests.cs index eefd59f20..c3838d270 100644 --- a/src/PostIt/PostIt.Tests/EstimateListPageViewModelTests.cs +++ b/src/PostIt/PostIt.Tests/EstimateListPageViewModelTests.cs @@ -4,6 +4,7 @@ using Yavsc.Api.Client; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public class EstimateListPageViewModelTests { [Fact] diff --git a/src/PostIt/PostIt.Tests/EstimateValidationPageViewModelTests.cs b/src/PostIt/PostIt.Tests/EstimateValidationPageViewModelTests.cs index 02a6c64bd..ef23eefaa 100644 --- a/src/PostIt/PostIt.Tests/EstimateValidationPageViewModelTests.cs +++ b/src/PostIt/PostIt.Tests/EstimateValidationPageViewModelTests.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Net.Http; using PostIt.Controls; using PostIt.ViewModels; using Yavsc.Api.Client; @@ -19,6 +16,7 @@ namespace PostIt.Tests; /// TestApp makes GoBackAsync a no-op, so the success paths /// run to completion without navigation side effects. /// +[Trait("Category", "non-reg")] public class EstimateValidationPageViewModelTests { private static EstimateDto SampleEstimate(long? commandId = 42) => new() @@ -252,4 +250,4 @@ public class EstimateValidationPageViewModelTests public ValueTask DisposeAsync() => ValueTask.CompletedTask; } -} \ No newline at end of file +} diff --git a/src/PostIt/PostIt.Tests/AndroidCameraFrameRotationTestActivity.cs b/src/PostIt/PostIt.Tests/Fixtures/AndroidCameraFrameRotationTestActivity.cs similarity index 100% rename from src/PostIt/PostIt.Tests/AndroidCameraFrameRotationTestActivity.cs rename to src/PostIt/PostIt.Tests/Fixtures/AndroidCameraFrameRotationTestActivity.cs diff --git a/src/PostIt/PostIt.Tests/AndroidChatServiceTestActivity.cs b/src/PostIt/PostIt.Tests/Fixtures/AndroidChatServiceTestActivity.cs similarity index 100% rename from src/PostIt/PostIt.Tests/AndroidChatServiceTestActivity.cs rename to src/PostIt/PostIt.Tests/Fixtures/AndroidChatServiceTestActivity.cs diff --git a/src/PostIt/PostIt.Tests/AndroidLanCallTestActivity.cs b/src/PostIt/PostIt.Tests/Fixtures/AndroidLanCallTestActivity.cs similarity index 100% rename from src/PostIt/PostIt.Tests/AndroidLanCallTestActivity.cs rename to src/PostIt/PostIt.Tests/Fixtures/AndroidLanCallTestActivity.cs diff --git a/src/PostIt/PostIt.Tests/AndroidMarkdownEditorTestActivity.cs b/src/PostIt/PostIt.Tests/Fixtures/AndroidMarkdownEditorTestActivity.cs similarity index 100% rename from src/PostIt/PostIt.Tests/AndroidMarkdownEditorTestActivity.cs rename to src/PostIt/PostIt.Tests/Fixtures/AndroidMarkdownEditorTestActivity.cs diff --git a/src/PostIt/PostIt.Tests/AndroidPodcastBlurTestActivity.cs b/src/PostIt/PostIt.Tests/Fixtures/AndroidPodcastBlurTestActivity.cs similarity index 100% rename from src/PostIt/PostIt.Tests/AndroidPodcastBlurTestActivity.cs rename to src/PostIt/PostIt.Tests/Fixtures/AndroidPodcastBlurTestActivity.cs diff --git a/src/PostIt/PostIt.Tests/AndroidPodcastCaptureTestActivity.cs b/src/PostIt/PostIt.Tests/Fixtures/AndroidPodcastCaptureTestActivity.cs similarity index 100% rename from src/PostIt/PostIt.Tests/AndroidPodcastCaptureTestActivity.cs rename to src/PostIt/PostIt.Tests/Fixtures/AndroidPodcastCaptureTestActivity.cs diff --git a/src/PostIt/PostIt.Tests/AndroidScreenAwakeTestActivity.cs b/src/PostIt/PostIt.Tests/Fixtures/AndroidScreenAwakeTestActivity.cs similarity index 100% rename from src/PostIt/PostIt.Tests/AndroidScreenAwakeTestActivity.cs rename to src/PostIt/PostIt.Tests/Fixtures/AndroidScreenAwakeTestActivity.cs diff --git a/src/PostIt/PostIt.Tests/AndroidWebRtcTestActivity.cs b/src/PostIt/PostIt.Tests/Fixtures/AndroidWebRtcTestActivity.cs similarity index 100% rename from src/PostIt/PostIt.Tests/AndroidWebRtcTestActivity.cs rename to src/PostIt/PostIt.Tests/Fixtures/AndroidWebRtcTestActivity.cs diff --git a/src/PostIt/PostIt.Tests/BlogApiTestFakes.cs b/src/PostIt/PostIt.Tests/Fixtures/BlogApiTestFakes.cs similarity index 100% rename from src/PostIt/PostIt.Tests/BlogApiTestFakes.cs rename to src/PostIt/PostIt.Tests/Fixtures/BlogApiTestFakes.cs diff --git a/src/PostIt/PostIt.Tests/FakeAuthorizingBrowser.cs b/src/PostIt/PostIt.Tests/Fixtures/FakeAuthorizingBrowser.cs similarity index 100% rename from src/PostIt/PostIt.Tests/FakeAuthorizingBrowser.cs rename to src/PostIt/PostIt.Tests/Fixtures/FakeAuthorizingBrowser.cs diff --git a/src/PostIt/PostIt.Tests/OidcStubAuthority.cs b/src/PostIt/PostIt.Tests/Fixtures/OidcStubAuthority.cs similarity index 100% rename from src/PostIt/PostIt.Tests/OidcStubAuthority.cs rename to src/PostIt/PostIt.Tests/Fixtures/OidcStubAuthority.cs diff --git a/src/PostIt/PostIt.Tests/TestApp.cs b/src/PostIt/PostIt.Tests/Fixtures/TestApp.cs similarity index 100% rename from src/PostIt/PostIt.Tests/TestApp.cs rename to src/PostIt/PostIt.Tests/Fixtures/TestApp.cs diff --git a/src/PostIt/PostIt.Tests/TestAppContext.cs b/src/PostIt/PostIt.Tests/Fixtures/TestAppContext.cs similarity index 100% rename from src/PostIt/PostIt.Tests/TestAppContext.cs rename to src/PostIt/PostIt.Tests/Fixtures/TestAppContext.cs diff --git a/src/PostIt/PostIt.Tests/FrontOfficeApiClientTests.cs b/src/PostIt/PostIt.Tests/FrontOfficeApiClientTests.cs index 02f6ae149..d262eff7b 100644 --- a/src/PostIt/PostIt.Tests/FrontOfficeApiClientTests.cs +++ b/src/PostIt/PostIt.Tests/FrontOfficeApiClientTests.cs @@ -1,4 +1,3 @@ -using System.Net.Http; using Yavsc.Api.Client; namespace PostIt.Tests; @@ -9,6 +8,7 @@ namespace PostIt.Tests; /// the PostIt signature payload, using a recording fake /// (no network). /// +[Trait("Category", "non-reg")] public class FrontOfficeApiClientTests { private static QueryAcceptanceRequestDto SampleBody() => new() @@ -154,4 +154,4 @@ public class FrontOfficeApiClientTests public ValueTask DisposeAsync() => ValueTask.CompletedTask; } -} \ No newline at end of file +} diff --git a/src/PostIt/PostIt.Tests/HomePageNotificationsTests.cs b/src/PostIt/PostIt.Tests/HomePageNotificationsTests.cs index 3656f0d83..b9ca27cab 100644 --- a/src/PostIt/PostIt.Tests/HomePageNotificationsTests.cs +++ b/src/PostIt/PostIt.Tests/HomePageNotificationsTests.cs @@ -1,15 +1,12 @@ -using System.Net.Http; -using Avalonia.Controls; using Avalonia.Headless.XUnit; -using Avalonia.VisualTree; using PostIt.Services; using PostIt.ViewModels; -using PostIt.Views; using Yavsc.Abstract.Models.Messaging; using Yavsc.Api.Client; namespace PostIt.Tests; +[Trait("Category", "non-reg")] public class HomePageNotificationsTests { [Fact] @@ -164,56 +161,6 @@ public class HomePageNotificationsTests Assert.Null(transport.LastMethod); } - [AvaloniaFact] - public async Task Home_page_loads_on_navigation_and_renders_wrapped_titles_and_bodies() - { - var transport = new NotificationTransport - { - Response = Task.FromResult(new List { Note(1, "Notification title") }) - }; - var vm = CreateViewModel(transport); - var page = new HomePage { DataContext = vm }; - var nav = new NavigationPage(); - var window = new Window { Content = nav, Width = 320, Height = 450 }; - try - { - window.Show(); - await nav.PushAsync(page); - window.UpdateLayout(); - - Assert.Single(vm.Notifications); - var texts = page.GetVisualDescendants().OfType().ToArray(); - Assert.Contains(texts, t => t.Text == "Notification title" - && t.TextWrapping == Avalonia.Media.TextWrapping.Wrap); - Assert.Contains(texts, t => t.Text == "Notification body" - && t.TextWrapping == Avalonia.Media.TextWrapping.Wrap); - var refresh = Assert.Single(page.GetVisualDescendants().OfType