Refactor: Expanded Testing Project Structure

.github/dependabot.yml

@@ -1,26 +1,42 @@
 version: 2
-updates:
-  - package-ecosystem: "nuget"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "Chore(deps): "
-      include: "scope"
 
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-        interval: "weekly"
-    commit-message:
-        prefix: "Chore(deps): "
-        include: "scope"
+updates:
+    -   package-ecosystem: "nuget"
+        directory: "/"
+        schedule:
+            interval: "weekly"
+
+        commit-message:
+            prefix: "Chore(deps): "
+            include: "scope"
+
+        groups:
+            tunit:
+                patterns:
+                    - "TUnit*"
+
+            serilog:
+                patterns:
+                    - "Serilog*"
+
+            microsoft-extensions:
+                patterns:
+                    - "Microsoft.Extensions.*"
 
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-        interval: "weekly"
-    commit-message:
-        prefix: "Chore(deps): "
-        include: "scope"
+    -   package-ecosystem: "npm"
+        directory: "/"
+        schedule:
+            interval: "weekly"
+
+        commit-message:
+            prefix: "Chore(deps): "
+            include: "scope"
 
+    -   package-ecosystem: "github-actions"
+        directory: "/"
+        schedule:
+            interval: "weekly"
+
+        commit-message:
+            prefix: "Chore(deps): "
+            include: "scope"

.github/workflows/shared-testing-windows-playwright.yml → .github/workflows/shared-testing-windows-automation.yml

@@ -65,13 +65,13 @@ jobs:
             matrix:
                 project:
                     -   name: WebApp Vue
-                        path: InfiniFrameTests.Playwright.WebApp.Vue
-                        sourceFolder: tests/InfiniFrameTests.Playwright.WebApp.Vue/Sources/infiniframe-playwright-vue
+                        path: InfiniAutomationTests.WebApp.Vue
+                        sourceFolder: tests/InfiniAutomationTests.WebApp.Vue/Sources/infiniframe-playwright-vue
                     -   name: WebApp React
-                        path: InfiniFrameTests.Playwright.WebApp.React
-                        sourceFolder: tests/InfiniFrameTests.Playwright.WebApp.React/Sources/infiniframe-playwright-react
+                        path: InfiniAutomationTests.WebApp.React
+                        sourceFolder: tests/InfiniAutomationTests.WebApp.React/Sources/infiniframe-playwright-react
                     -   name: Blazor MudBlazor
-                        path: InfiniFrameTests.Playwright.BlazorWebView.MudBlazor
+                        path: InfiniAutomationTests.BlazorWebView.MudBlazor
                         sourceFolder: ""
 
         env:
@@ -138,7 +138,7 @@ jobs:
 
             -   name: Restore
                 run: |
-                    dotnet restore InfiniFrame.GitHubActions.Testing.Playwright.slnf `
+                    dotnet restore InfiniFrame.GitHubActions.Testing.Automation.slnf `
                       /p:NoWarn=NU1503
 
             -   name: Build Tests

.github/workflows/shared-testing-windows.yml

@@ -109,7 +109,7 @@ jobs:
                     New-ItemProperty -Path $werBase -Name DumpType -PropertyType DWord -Value 2 -Force | Out-Null
                     New-ItemProperty -Path $werBase -Name DumpCount -PropertyType DWord -Value 20 -Force | Out-Null
 
-                    foreach ($exe in @("testhost.exe", "InfiniFrameTests.exe", "dotnet.exe")) {
+                    foreach ($exe in @("testhost.exe", "InfiniTests.InfiniFrame.exe", "dotnet.exe")) {
                       $exeKey = Join-Path $werBase $exe
                       New-Item -Path $exeKey -Force | Out-Null
                       New-ItemProperty -Path $exeKey -Name DumpFolder -PropertyType ExpandString -Value $dumpRoot -Force | Out-Null
@@ -145,7 +145,7 @@ jobs:
                     Write-Host "Runner architecture: $env:PROCESSOR_ARCHITECTURE"
                     dotnet --info
 
-                    $nativeFiles = Get-ChildItem -Path "tests/InfiniFrameTests/bin/Release" -Recurse -File `
+                    $nativeFiles = Get-ChildItem -Path "tests/InfiniTests/bin/Release" -Recurse -File `
                       | Where-Object { $_.Name -in @("InfiniFrame.Native.dll", "WebView2Loader.dll", "testhost.exe") }
                     foreach ($file in $nativeFiles) {
                       $machine = Get-PeMachine $file.FullName

.github/workflows/shared-testing.yml

@@ -156,7 +156,7 @@ jobs:
         name: Windows Playwright Tests
         if: ${{ inputs.run_windows_playwright == true }}
         needs: [ prepare, native-build ]
-        uses: ./.github/workflows/shared-testing-windows-playwright.yml
+        uses: ./.github/workflows/shared-testing-windows-automation.yml
         with:
             pr_number: ${{ inputs.pr_number }}
             checkout_ref: ${{ inputs.checkout_ref }}

.gitignore

@@ -362,9 +362,9 @@ healthchecksdb
 # wwwroot folders from js web based projects
 /examples/InfiniFrameExample.WebApp.React/wwwroot/
 /examples/InfiniFrameExample.WebApp.Vue/wwwroot/
-/tests/InfiniFrameTests.Playwright.WebApp.React/wwwroot/
-/tests/InfiniFrameTests.Playwright.WebApp.Vue/wwwroot/
-#/tests/InfiniFrameTests.Playwright.BlazorWebView.MudBlazor/wwwroot/ This needs to be included for Blazor to work
+/tests/InfiniAutomationTests.WebApp.React/wwwroot/
+/tests/InfiniAutomationTests.WebApp.Vue/wwwroot/
+#/tests/InfiniAutomationTests.BlazorWebView.MudBlazor/wwwroot/ This needs to be included for Blazor to work
 
 /docs/.docusaurus
 /docs/build/

Directory.Packages.props

@@ -33,9 +33,9 @@
     <PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
-    <PackageVersion Include="TUnit" Version="1.47.0" />
-    <PackageVersion Include="TUnit.Assertions" Version="1.47.0" />
-    <PackageVersion Include="TUnit.Core" Version="1.47.0" />
-    <PackageVersion Include="TUnit.Playwright" Version="1.47.0" />
+    <PackageVersion Include="TUnit" Version="1.48.6" />
+    <PackageVersion Include="TUnit.Assertions" Version="1.48.6" />
+    <PackageVersion Include="TUnit.Core" Version="1.48.6" />
+    <PackageVersion Include="TUnit.Playwright" Version="1.48.6" />
   </ItemGroup>
 </Project>

InfiniFrame.GitHubActions.Testing.Playwright.slnf → InfiniFrame.GitHubActions.Testing.Automation.slnf

@@ -11,11 +11,11 @@
             "src\\InfiniFrame.Tools.Pack\\InfiniFrame.Tools.Pack.csproj",
             "src\\InfiniFrame.WebServer\\InfiniFrame.WebServer.csproj",
 
-            "tests\\InfiniFrameTests.Shared\\InfiniFrameTests.Shared.csproj",
-            "tests\\InfiniFrameTests.Playwright\\InfiniFrameTests.Playwright.csproj",
-            "tests\\InfiniFrameTests.Playwright.WebApp.React\\InfiniFrameTests.Playwright.WebApp.React.csproj",
-            "tests\\InfiniFrameTests.Playwright.WebApp.Vue\\InfiniFrameTests.Playwright.WebApp.Vue.csproj",
-            "tests\\InfiniFrameTests.Playwright.BlazorWebView.MudBlazor\\InfiniFrameTests.Playwright.BlazorWebView.MudBlazor.csproj"
+            "tests\\InfiniTests\\InfiniTests.csproj",
+            "tests\\InfiniAutomationTests\\InfiniAutomationTests.csproj",
+            "tests\\InfiniAutomationTests.BlazorWebView.MudBlazor\\InfiniAutomationTests.BlazorWebView.MudBlazor.csproj",
+            "tests\\InfiniAutomationTests.WebApp.React\\InfiniAutomationTests.WebApp.React.csproj",
+            "tests\\InfiniAutomationTests.WebApp.Vue\\InfiniAutomationTests.WebApp.Vue.csproj"
         ]
     }
 }

InfiniFrame.GitHubActions.Testing.slnf

@@ -10,13 +10,17 @@
             "src\\InfiniFrame.Shared\\InfiniFrame.Shared.csproj",
             "src\\InfiniFrame.Tools.Pack\\InfiniFrame.Tools.Pack.csproj",
             "src\\InfiniFrame.WebServer\\InfiniFrame.WebServer.csproj",
-
-            "tests\\InfiniFrameTests.Shared\\InfiniFrameTests.Shared.csproj",
-            "tests\\InfiniFrameTests\\InfiniFrameTests.csproj",
-            "tests\\InfiniFrameTests.Blazor\\InfiniFrameTests.Blazor.csproj",
-            "tests\\InfiniFrameTests.BlazorWebView\\InfiniFrameTests.BlazorWebView.csproj",
-            "tests\\InfiniFrameTests.Tools.Pack\\InfiniFrameTests.Tools.Pack.csproj",
-            "tests\\InfiniFrameTests.WebServer\\InfiniFrameTests.WebServer.csproj"
+
+            "tests\\InfiniTests\\InfiniTests.csproj",
+            "tests\\InfiniTests.InfiniFrame\\InfiniTests.InfiniFrame.csproj",
+            "tests\\InfiniTests.InfiniFrame.Blazor\\InfiniTests.InfiniFrame.Blazor.csproj",
+            "tests\\InfiniTests.InfiniFrame.BlazorWebView\\InfiniTests.InfiniFrame.BlazorWebView.csproj",
+            "tests\\InfiniTests.InfiniFrame.Js\\InfiniTests.InfiniFrame.Js.csproj",
+            "tests\\InfiniTests.InfiniFrame.NativeBridge\\InfiniTests.InfiniFrame.NativeBridge.csproj",
+            "tests\\InfiniTests.InfiniFrame.Shared\\InfiniTests.InfiniFrame.Shared.csproj",
+            "tests\\InfiniTests.InfiniFrame.WebServer\\InfiniTests.InfiniFrame.WebServer.csproj",
+
+            "tests\\InfiniTests.InfiniFrame.Tools.Pack\\InfiniTests.InfiniFrame.Tools.Pack.csproj"
         ]
     }
 }

InfiniFrame.GitHubActions.slnf

@@ -11,15 +11,21 @@
             "src\\InfiniFrame.Tools.Pack\\InfiniFrame.Tools.Pack.csproj",
             "src\\InfiniFrame.WebServer\\InfiniFrame.WebServer.csproj",
 
-            "tests\\InfiniFrameTests\\InfiniFrameTests.csproj",
-            "tests\\InfiniFrameTests.Playwright.WebApp.React\\InfiniFrameTests.Playwright.WebApp.React.csproj",
-            "tests\\InfiniFrameTests.Playwright.WebApp.Vue\\InfiniFrameTests.Playwright.WebApp.Vue.csproj",
-            "tests\\InfiniFrameTests.Playwright.BlazorWebView.MudBlazor\\InfiniFrameTests.Playwright.BlazorWebView.MudBlazor.csproj",
-            "tests\\InfiniFrameTests.Shared\\InfiniFrameTests.Shared.csproj",
-            "tests\\InfiniFrameTests.Tools.Pack\\InfiniFrameTests.Tools.Pack.csproj",
-            "tests\\InfiniFrameTests.WebServer\\InfiniFrameTests.WebServer.csproj",
-            "tests\\InfiniFrameTests.Blazor\\InfiniFrameTests.Blazor.csproj",
-            "tests\\InfiniFrameTests.BlazorWebView\\InfiniFrameTests.BlazorWebView.csproj"
+            "tests\\InfiniTests\\InfiniTests.csproj",
+            "tests\\InfiniTests.InfiniFrame\\InfiniTests.InfiniFrame.csproj",
+            "tests\\InfiniTests.InfiniFrame.Blazor\\InfiniTests.InfiniFrame.Blazor.csproj",
+            "tests\\InfiniTests.InfiniFrame.BlazorWebView\\InfiniTests.InfiniFrame.BlazorWebView.csproj",
+            "tests\\InfiniTests.InfiniFrame.Js\\InfiniTests.InfiniFrame.Js.csproj",
+            "tests\\InfiniTests.InfiniFrame.NativeBridge\\InfiniTests.InfiniFrame.NativeBridge.csproj",
+            "tests\\InfiniTests.InfiniFrame.Shared\\InfiniTests.InfiniFrame.Shared.csproj",
+            "tests\\InfiniTests.InfiniFrame.WebServer\\InfiniTests.InfiniFrame.WebServer.csproj",
+
+            "tests\\InfiniTests.InfiniFrame.Tools.Pack\\InfiniTests.InfiniFrame.Tools.Pack.csproj",
+
+            "tests\\InfiniAutomationTests\\InfiniAutomationTests.csproj",
+            "tests\\InfiniAutomationTests.BlazorWebView.MudBlazor\\InfiniAutomationTests.BlazorWebView.MudBlazor.csproj",
+            "tests\\InfiniAutomationTests.WebApp.React\\InfiniAutomationTests.WebApp.React.csproj",
+            "tests\\InfiniAutomationTests.WebApp.Vue\\InfiniAutomationTests.WebApp.Vue.csproj"
         ]
     }
 }

InfiniFrame.slnx

@@ -2,7 +2,7 @@
   <Folder Name="/.dev-tools/">
     <File Path=".gitattributes" />
     <File Path=".gitignore" />
-    <File Path="InfiniFrame.GitHubActions.Testing.Playwright.slnf" />
+    <File Path="InfiniFrame.GitHubActions.Testing.Automation.slnf" />
     <File Path="LICENSE" />
     <File Path="native-vendor-deps.json" />
     <File Path="README.md" />
@@ -84,7 +84,7 @@
     <File Path=".github/workflows/shared-testing-windows.yml" />
     <File Path=".github/workflows/shared-testing-dotnetpack.yml" />
     <File Path=".github/workflows/shared-testing-js.yml" />
-    <File Path=".github/workflows/shared-testing-windows-playwright.yml" />
+    <File Path=".github/workflows/shared-testing-windows-automation.yml" />
     <File Path=".github/workflows/shared-testing-python.yml" />
     <File Path=".github/workflows/shared-testing-windows-trim-aot.yml" />
     <File Path=".github/workflows/shared-testing.yml" />
@@ -125,15 +125,22 @@
   </Folder>
   <Folder Name="/tests/">
     <File Path="tests/Directory.Build.props" />
-    <Project Path="tests/InfiniFrameTests.Blazor/InfiniFrameTests.Blazor.csproj" />
-    <Project Path="tests/InfiniFrameTests.BlazorWebView/InfiniFrameTests.BlazorWebView.csproj" />
-    <Project Path="tests/InfiniFrameTests.Playwright/InfiniFrameTests.Playwright.csproj" />
-    <Project Path="tests/InfiniFrameTests.Playwright.BlazorWebView.MudBlazor/InfiniFrameTests.Playwright.BlazorWebView.MudBlazor.csproj" />
-    <Project Path="tests/InfiniFrameTests.Playwright.WebApp.React/InfiniFrameTests.Playwright.WebApp.React.csproj" />
-    <Project Path="tests/InfiniFrameTests.Playwright.WebApp.Vue/InfiniFrameTests.Playwright.WebApp.Vue.csproj" />
-    <Project Path="tests/InfiniFrameTests.Shared/InfiniFrameTests.Shared.csproj" />
-    <Project Path="tests/InfiniFrameTests.Tools.Pack/InfiniFrameTests.Tools.Pack.csproj" />
-    <Project Path="tests/InfiniFrameTests.WebServer/InfiniFrameTests.WebServer.csproj" />
-    <Project Path="tests/InfiniFrameTests/InfiniFrameTests.csproj" />
+    <Project Path="tests/InfiniTests.InfiniFrame.Blazor/InfiniTests.InfiniFrame.Blazor.csproj" />
+    <Project Path="tests/InfiniTests.InfiniFrame.BlazorWebView/InfiniTests.InfiniFrame.BlazorWebView.csproj" />
+    <Project Path="tests/InfiniTests.InfiniFrame.Js/InfiniTests.InfiniFrame.Js.csproj" />
+    <Project Path="tests/InfiniTests.InfiniFrame.NativeBridge/InfiniTests.InfiniFrame.NativeBridge.csproj" />
+    <Project Path="tests/InfiniTests.InfiniFrame.Shared/InfiniTests.InfiniFrame.Shared.csproj" />
+    <Project Path="tests/InfiniTests.InfiniFrame.WebServer/InfiniTests.InfiniFrame.WebServer.csproj" />
+    <Project Path="tests/InfiniTests.InfiniFrame/InfiniTests.InfiniFrame.csproj" />
+    <Project Path="tests/InfiniTests/InfiniTests.csproj" />
+  </Folder>
+  <Folder Name="/tests/automation/">
+    <Project Path="tests/InfiniAutomationTests.BlazorWebView.MudBlazor/InfiniAutomationTests.BlazorWebView.MudBlazor.csproj" />
+    <Project Path="tests/InfiniAutomationTests/InfiniAutomationTests.csproj" />
+    <Project Path="tests/InfiniAutomationTests.WebApp.React/InfiniAutomationTests.WebApp.React.csproj" />
+    <Project Path="tests/InfiniAutomationTests.WebApp.Vue/InfiniAutomationTests.WebApp.Vue.csproj" />
+  </Folder>
+  <Folder Name="/tests/tools/">
+    <Project Path="tests/InfiniTests.InfiniFrame.Tools.Pack/InfiniTests.InfiniFrame.Tools.Pack.csproj" />
   </Folder>
 </Solution>

src/Directory.Build.props

@@ -46,19 +46,25 @@
         <InternalsVisibleTo Include="InfiniFrame.Blazor" />
         <InternalsVisibleTo Include="InfiniFrame.BlazorWebView" />
         <InternalsVisibleTo Include="InfiniFrame.Js" />
-        <InternalsVisibleTo Include="InfiniFrame.Native" />
+        <InternalsVisibleTo Include="InfiniFrame.NativeBridge" />
         <InternalsVisibleTo Include="InfiniFrame.Shared" />
         <InternalsVisibleTo Include="InfiniFrame.WebServer" />
-        <InternalsVisibleTo Include="InfiniFrameTests" />
-        <InternalsVisibleTo Include="InfiniFrameTests.Blazor" />
-        <InternalsVisibleTo Include="InfiniFrameTests.BlazorWebView" />
-        <InternalsVisibleTo Include="InfiniFrameTests.Playwright" />
-        <InternalsVisibleTo Include="InfiniFrameTests.Playwright.BlazorWebView.MudBlazor" />
-        <InternalsVisibleTo Include="InfiniFrameTests.Playwright.WebApp.React" />
-        <InternalsVisibleTo Include="InfiniFrameTests.Playwright.WebApp.Vue" />
-        <InternalsVisibleTo Include="InfiniFrameTests.Shared" />
-        <InternalsVisibleTo Include="InfiniFrameTests.Tools.Pack" />
-        <InternalsVisibleTo Include="InfiniFrameTests.WebServer" />
+
+        <InternalsVisibleTo Include="InfiniTests" />
+        <InternalsVisibleTo Include="InfiniTests.InfiniFrame" />
+        <InternalsVisibleTo Include="InfiniTests.InfiniFrame.Blazor" />
+        <InternalsVisibleTo Include="InfiniTests.InfiniFrame.BlazorWebView" />
+        <InternalsVisibleTo Include="InfiniTests.InfiniFrame.Js" />
+        <InternalsVisibleTo Include="InfiniTests.InfiniFrame.NativeBridge" />
+        <InternalsVisibleTo Include="InfiniTests.InfiniFrame.Shared" />
+        <InternalsVisibleTo Include="InfiniTests.InfiniFrame.WebServer" />
+
+        <InternalsVisibleTo Include="InfiniTests.InfiniFrame.Tools.Pack" />
+
+        <InternalsVisibleTo Include="InfiniAutomationTests" />
+        <InternalsVisibleTo Include="InfiniAutomationTests.BlazorWebView.MudBlazor" />
+        <InternalsVisibleTo Include="InfiniAutomationTests.WebApp.React" />
+        <InternalsVisibleTo Include="InfiniAutomationTests.WebApp.Vue" />
 
         <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
     </ItemGroup>

src/InfiniFrame.BlazorWebView/InfiniFrame.BlazorWebView.csproj

@@ -11,7 +11,7 @@
     <ItemGroup>
         <ProjectReference Include="$(MSBuildThisFileDirectory)../InfiniFrame/InfiniFrame.csproj"/>
         <ProjectReference Include="$(MSBuildThisFileDirectory)../InfiniFrame.Blazor/InfiniFrame.Blazor.csproj" />
-        <ProjectReference Include="..\InfiniFrame.Shared\InfiniFrame.Shared.csproj" />
+        <ProjectReference Include="../InfiniFrame.Shared/InfiniFrame.Shared.csproj" />
     </ItemGroup>
 
 </Project>

src/InfiniFrame.BlazorWebView/InfiniFrameSynchronizationContext.cs

@@ -4,7 +4,7 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-using InfiniFrame.BlazorWebView.Utils;
+using InfiniFrame.BlazorWebView.Utilities;
 using InfiniFrame.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 

src/InfiniFrame.BlazorWebView/InfiniFrameWebViewManager.cs

@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-using InfiniFrame.BlazorWebView.Utils;
+using InfiniFrame.BlazorWebView.Utilities;
 using InfiniFrame.Security;
 using InfiniFrame.Utilities;
 using Microsoft.AspNetCore.Components;

src/InfiniFrame.Shared/BlazorWebView/Utils/CallbackTaskCompletionSource.cs → src/InfiniFrame.BlazorWebView/Utilities/CallbackTaskCompletionSource.cs

@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-namespace InfiniFrame.BlazorWebView.Utils;
+namespace InfiniFrame.BlazorWebView.Utilities;
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------

src/InfiniFrame.Shared/BlazorWebView/Utils/SynchronousTaskScheduler.cs → src/InfiniFrame.BlazorWebView/Utilities/SynchronousTaskScheduler.cs

@@ -1,19 +1,22 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-namespace InfiniFrame.BlazorWebView.Utils;
+namespace InfiniFrame.BlazorWebView.Utilities;
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------
 internal class SynchronousTaskScheduler : TaskScheduler {
     public override int MaximumConcurrencyLevel => 1;
 
+    // -----------------------------------------------------------------------------------------------------------------
+    // Methods
+    // -----------------------------------------------------------------------------------------------------------------
     protected override void QueueTask(Task task) 
         => TryExecuteTask(task);
 
     protected override bool TryExecuteTaskInline(Task task, bool taskWasPreviouslyQueued) 
         => TryExecuteTask(task);
 
     protected override IEnumerable<Task> GetScheduledTasks() 
-        => Enumerable.Empty<Task>();
+        => [];
 }