diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b177c04aa9f..db0f6a12034 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -23,13 +23,6 @@ ], "rollForward": false }, - "microsoft.dotnet.xharness.cli": { - "version": "11.0.0-prerelease.26107.1", - "commands": [ - "xharness" - ], - "rollForward": false - }, "api-tools": { "version": "1.4.0", "commands": [ @@ -50,6 +43,13 @@ "docfx" ], "rollForward": false + }, + "appledev.tools": { + "version": "0.8.10", + "commands": [ + "apple" + ], + "rollForward": false } } -} +} \ No newline at end of file diff --git a/documentation/dev/updating-dotnet-version.md b/documentation/dev/updating-dotnet-version.md index 5f070d61988..eea304fce6d 100644 --- a/documentation/dev/updating-dotnet-version.md +++ b/documentation/dev/updating-dotnet-version.md @@ -75,7 +75,6 @@ All use `$(TFMPrevious)-platform$(TPVPrevious);$(TFMCurrent)-platform$(TPVCurren ### 7. Utility Projects - [ ] `utils/SkiaSharpGenerator/SkiaSharpGenerator.csproj` -- [ ] `utils/WasmTestRunner/WasmTestRunner.csproj` - [ ] `utils/NativeLibraryMiniTest/docker/NativeLibraryMiniTest.csproj` ### 8. Sample Projects diff --git a/scripts/azure-templates-stages-test.yml b/scripts/azure-templates-stages-test.yml index 9c49cad19eb..278128bf626 100644 --- a/scripts/azure-templates-stages-test.yml +++ b/scripts/azure-templates-stages-test.yml @@ -246,8 +246,8 @@ stages: displayName: Publish the Android test results condition: always() inputs: - testResultsFormat: xUnit - testResultsFiles: 'output/logs/testlogs/**/TestResults.xml' + testResultsFormat: VSTest + testResultsFiles: 'output/logs/testlogs/**/*.trx' testRunTitle: 'Android Tests (API $(ANDROID_TEST_DEVICE_VERSION))' publishArtifacts: - name: testlogs_android_$(ANDROID_TEST_DEVICE_VERSION) @@ -270,8 +270,8 @@ stages: displayName: Publish the iOS test results condition: always() inputs: - testResultsFormat: xUnit - testResultsFiles: 'output/logs/testlogs/**/TestResults.xml' + testResultsFormat: VSTest + testResultsFiles: 'output/logs/testlogs/**/*.trx' testRunTitle: 'iOS Tests (v$(IOS_TEST_DEVICE_VERSION))' publishArtifacts: - name: testlogs_ios_$(IOS_TEST_DEVICE_VERSION) @@ -296,8 +296,8 @@ stages: displayName: Publish the Mac Catalyst test results condition: always() inputs: - testResultsFormat: xUnit - testResultsFiles: 'output/logs/testlogs/**/TestResults.xml' + testResultsFormat: VSTest + testResultsFiles: 'output/logs/testlogs/**/*.trx' testRunTitle: 'Mac Catalyst Tests' publishArtifacts: - name: testlogs_maccatalyst @@ -310,7 +310,7 @@ stages: buildAgent: ${{ parameters.buildAgentLinux }} packages: $(MANAGED_LINUX_PACKAGES) ninja-build target: tests-wasm - additionalArgs: --skipExternals="all" --coverage=false --chromedriver=$(CHROMEWEBDRIVER) + additionalArgs: --skipExternals="all" --coverage=false installAndroidSdk: false shouldPublish: false requiredArtifacts: @@ -322,8 +322,8 @@ stages: displayName: Publish the WASM test results condition: always() inputs: - testResultsFormat: xUnit - testResultsFiles: 'output/logs/testlogs/**/*.xml' + testResultsFormat: VSTest + testResultsFiles: 'output/logs/testlogs/**/*.trx' testRunTitle: 'Linux WASM Tests' publishArtifacts: - name: testlogs_wasm diff --git a/scripts/infra/caching/repo-deps.json b/scripts/infra/caching/repo-deps.json index 3028fc385a2..9da6458c8e6 100644 --- a/scripts/infra/caching/repo-deps.json +++ b/scripts/infra/caching/repo-deps.json @@ -112,7 +112,6 @@ "tests/**", "scripts/infra/tests/**", "benchmarks/**", - "utils/WasmTestRunner/**", "utils/NativeLibraryMiniTest/**" ] } diff --git a/scripts/infra/shared/shared.cake b/scripts/infra/shared/shared.cake index b0f664451c8..8a4327c5c4d 100644 --- a/scripts/infra/shared/shared.cake +++ b/scripts/infra/shared/shared.cake @@ -300,5 +300,9 @@ void TakeSnapshot(DirectoryPath output, string name) var fname = $"screenshot-{DateTime.Now:yyyyMMdd_hhmmss}-{name}.jpg"; var dest = output.CombineWithFilePath(fname); - RunProcess("screencapture", dest.FullPath); + try { + RunProcess("screencapture", dest.FullPath); + } catch (Exception ex) { + Warning("Failed to take screenshot: {0}", ex.Message); + } } diff --git a/scripts/infra/tests/test-shared.cake b/scripts/infra/tests/test-shared.cake index 5fd8ba5296e..e5bb57133b1 100644 --- a/scripts/infra/tests/test-shared.cake +++ b/scripts/infra/tests/test-shared.cake @@ -2,6 +2,56 @@ #tool nuget:?package=xunit.runner.console&version=2.4.2 +//////////////////////////////////////////////////////////////////////////////////////////////////// +// DEVICE RUNNERS — shared helper for DeviceRunners.Testing.Targets based tests +//////////////////////////////////////////////////////////////////////////////////////////////////// + +void RunDeviceRunnersTest( + FilePath testProject, + DirectoryPath output, + string configuration = null, + string framework = null, + bool noBuild = false, + Dictionary properties = null) +{ + CleanDirectories($"{PACKAGE_CACHE_PATH}/skiasharp*"); + CleanDirectories($"{PACKAGE_CACHE_PATH}/harfbuzzsharp*"); + EnsureDirectoryExists(OUTPUT_NUGETS_PATH); + + output = MakeAbsolute(output); + CleanDirectories(output.FullPath); + + var msb = new DotNetMSBuildSettings(); + msb.Properties ["RestoreNoCache"] = new [] { "true" }; + msb.Properties ["RestorePackagesPath"] = new [] { PACKAGE_CACHE_PATH.FullPath }; + + if (properties != null) { + foreach (var prop in properties) { + if (!string.IsNullOrEmpty(prop.Value)) { + msb.Properties [prop.Key] = new [] { prop.Value }; + } + } + } + + var settings = new DotNetTestSettings { + Configuration = configuration ?? CONFIGURATION, + Framework = framework, + MSBuildSettings = msb, + NoBuild = noBuild, + ResultsDirectory = output, + Verbosity = DotNetVerbosity.Normal, + ArgumentCustomization = args => { + args = AppendForwardingLogger(args); + var sep = IsRunningOnWindows() ? ";" : "%3B"; + return args + .Append($"/p:RestoreSources=\"{string.Join(sep, GetNuGetSources())}\"") + .Append("--logger").Append("trx"); + }, + }; + + DotNetTest(MakeAbsolute(testProject).FullPath, settings); +} + //////////////////////////////////////////////////////////////////////////////////////////////////// // TEST UTILITIES — shared by desktop test cakes //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/scripts/infra/tests/tests-android.cake b/scripts/infra/tests/tests-android.cake index 579fce72494..3a9f1be97a9 100644 --- a/scripts/infra/tests/tests-android.cake +++ b/scripts/infra/tests/tests-android.cake @@ -2,17 +2,15 @@ DirectoryPath ROOT_PATH = MakeAbsolute(Directory("../../..")); #load "../shared/shared.cake" #load "../shared/msbuild.cake" +#load "test-shared.cake" //////////////////////////////////////////////////////////////////////////////////////////////////// -// ANDROID TESTS — build, emulator management, and xharness execution +// ANDROID TESTS — build, emulator management, and dotnet test execution //////////////////////////////////////////////////////////////////////////////////////////////////// -var TEST_APP = Argument("app", EnvironmentVariable("ANDROID_TEST_APP") ?? ""); var TEST_RESULTS = Argument("results", EnvironmentVariable("ANDROID_TEST_RESULTS") ?? ""); var TEST_DEVICE = Argument("device", EnvironmentVariable("ANDROID_TEST_DEVICE") ?? "android-emulator-64"); var TEST_VERSION = Argument("deviceVersion", EnvironmentVariable("ANDROID_TEST_DEVICE_VERSION") ?? "36"); -var TEST_APP_PACKAGE_NAME = Argument("package", EnvironmentVariable("ANDROID_TEST_APP_PACKAGE_NAME") ?? ""); -var TEST_APP_INSTRUMENTATION = Argument("instrumentation", EnvironmentVariable("ANDROID_TEST_APP_INSTRUMENTATION") ?? "devicerunners.xharness.maui.XHarnessInstrumentation"); var ANDROID_AVD = "DEVICE_TESTS_EMULATOR"; var DEVICE_NAME = Argument("skin", EnvironmentVariable("ANDROID_TEST_SKIN") ?? "Nexus 5X"); @@ -22,37 +20,6 @@ var usingEmulator = true; Setup(context => { - // if app wasn't passed as argument, build it - if (string.IsNullOrEmpty(TEST_APP)) { - FilePath csproj = $"{ROOT_PATH}/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj"; - var configuration = "Release"; - var tfm = "net10.0-android"; - var rid = "android-" + RuntimeInformation.ProcessArchitecture.ToString().ToLower(); - TEST_APP = ROOT_PATH + $"/tests/SkiaSharp.Tests.Devices/bin/{configuration}/{tfm}/{rid}/com.companyname.SkiaSharpTests-Signed.apk"; - - Information("=== Android Test Build Configuration ==="); - Information(" Project: {0}", csproj); - Information(" Configuration: {0}", configuration); - Information(" TFM: {0}", tfm); - Information(" RID: {0}", rid); - Information(" App Path: {0}", TEST_APP); - Information(" OS: {0}", RuntimeInformation.OSDescription); - Information(" Arch: {0}", RuntimeInformation.ProcessArchitecture); - Information("========================================"); - - CleanDirectories($"{PACKAGE_CACHE_PATH}/skiasharp*"); - CleanDirectories($"{PACKAGE_CACHE_PATH}/harfbuzzsharp*"); - - if (!SKIP_BUILD) { - RunDotNetBuild(csproj, - configuration: configuration, - properties: new Dictionary { - { "TargetFramework", tfm }, - { "RuntimeIdentifier", rid }, - }); - } - } - if (string.IsNullOrEmpty(TEST_RESULTS)) { TEST_RESULTS = $"{ROOT_PATH}/output/logs/testlogs/SkiaSharp.Tests.Devices.Android/{DATE_TIME_STR}"; } @@ -62,7 +29,6 @@ Setup(context => if (!string.IsNullOrEmpty(TEST_VERSION) && TEST_VERSION != "latest") TEST_DEVICE = $"{TEST_DEVICE}_{TEST_VERSION}"; - Information("Test App: {0}", TEST_APP); Information("Test Device: {0}", TEST_DEVICE); // determine the device characteristics @@ -91,6 +57,18 @@ Setup(context => DEVICE_ID = $"system-images;android-{api};google_apis;{DEVICE_ARCH}"; } + FilePath csproj = $"{ROOT_PATH}/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj"; + if (!SKIP_BUILD) { + // Pre-build the project before starting the emulator to reduce peak memory usage. + // Android IL linking is very memory-intensive and running it concurrently with the + // emulator can cause OOM on CI agents. + Information("Pre-building Android test project..."); + RunDotNetBuild(csproj, configuration: "Release", properties: new Dictionary { + { "TargetFramework", "net10.0-android" }, + }); + Information("Pre-build complete."); + } + if (!usingEmulator) { Information("Using a physical device:"); DotNetTool("android device list"); @@ -132,47 +110,9 @@ Teardown(context => Task("Default") .Does(() => { - if (string.IsNullOrEmpty(TEST_APP_PACKAGE_NAME)) { - var appFile = (FilePath)TEST_APP; - appFile = appFile.GetFilenameWithoutExtension(); - TEST_APP_PACKAGE_NAME = appFile.FullPath.Replace("-Signed", ""); - } - if (string.IsNullOrEmpty(TEST_APP_INSTRUMENTATION)) { - TEST_APP_INSTRUMENTATION = TEST_APP_PACKAGE_NAME + ".TestInstrumentation"; - } - - Information("Test App: {0}", TEST_APP); - Information("Test App Package Name: {0}", TEST_APP_PACKAGE_NAME); - Information("Test App Instrumentation: {0}", TEST_APP_INSTRUMENTATION); - Information("Test Results Directory: {0}", TEST_RESULTS); - - TakeSnapshot(TEST_RESULTS, "starting-tests"); - - var complete = false; - System.Threading.Tasks.Task.Run(() => { - while (!complete) { - TakeSnapshot(TEST_RESULTS, "running-tests"); - System.Threading.Thread.Sleep(5000); - } - }); + FilePath csproj = $"{ROOT_PATH}/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj"; - DotNetTool("xharness android test " + - $"--app=\"{TEST_APP}\" " + - $"--package-name=\"{TEST_APP_PACKAGE_NAME}\" " + - $"--instrumentation=\"{TEST_APP_INSTRUMENTATION}\" " + - $"--output-directory=\"{TEST_RESULTS}\" " + - $"--timeout=00:15:00 " + - $"--launch-timeout=00:05:00 " + - $"--verbosity=\"Debug\" "); - - complete = true; - - TakeSnapshot(TEST_RESULTS, "finished-tests"); - - var failed = XmlPeek($"{TEST_RESULTS}/TestResults.xml", "/assemblies/assembly[@failed > 0 or @errors > 0]/@failed"); - if (!string.IsNullOrEmpty(failed)) { - throw new Exception($"At least {failed} test(s) failed."); - } + RunDeviceRunnersTest(csproj, (DirectoryPath)TEST_RESULTS, configuration: "Release", framework: "net10.0-android", noBuild: true); }); RunTarget(TARGET); diff --git a/scripts/infra/tests/tests-apple.cake b/scripts/infra/tests/tests-apple.cake index 612b3ded449..973ee05afa3 100644 --- a/scripts/infra/tests/tests-apple.cake +++ b/scripts/infra/tests/tests-apple.cake @@ -2,73 +2,69 @@ DirectoryPath ROOT_PATH = MakeAbsolute(Directory("../../..")); #load "../shared/shared.cake" #load "../shared/msbuild.cake" +#load "test-shared.cake" //////////////////////////////////////////////////////////////////////////////////////////////////// -// APPLE TESTS — iOS, Mac Catalyst (build + xharness execution) +// APPLE TESTS — iOS, Mac Catalyst (build + dotnet test execution) //////////////////////////////////////////////////////////////////////////////////////////////////// -void RunAppleTests(string platform, string tfm, string configuration = "Debug") +var IOS_SIMULATOR_NAME = Argument("iosSimulator", EnvironmentVariable("IOS_SIMULATOR_NAME") ?? "iPhone 16"); + +Task ("tests-ios") + .Description ("Run all iOS tests.") + .Does (() => { - CleanDirectories ($"{PACKAGE_CACHE_PATH}/skiasharp*"); - CleanDirectories ($"{PACKAGE_CACHE_PATH}/harfbuzzsharp*"); + // Create a unique simulator for this test run (matches DeviceRunners CI pattern) + var simulatorName = $"SkiaSharp-Tests-{DateTime.UtcNow:yyyyMMdd-HHmmss}"; + Information("Creating iOS simulator: {0} (device type: {1})...", simulatorName, IOS_SIMULATOR_NAME); - FilePath csproj = $"{ROOT_PATH}/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj"; - var rid = $"{platform.Replace("ios", "iossimulator")}-{RuntimeInformation.ProcessArchitecture.ToString().ToLower()}"; - var outputDir = ROOT_PATH + $"/tests/SkiaSharp.Tests.Devices/bin/{configuration}/{tfm}/{rid}"; + // Create simulator and capture UDID from JSON output + RunProcess("dotnet", $"apple simulator create \"{simulatorName}\" --device-type \"{IOS_SIMULATOR_NAME}\" --format json", out var createStdout); - // build the app - if (!SKIP_BUILD) { - RunDotNetBuild (csproj, - configuration: configuration, - properties: new Dictionary { - { "TargetFramework", tfm }, - { "RuntimeIdentifier", rid }, - }); - } + try + { + var createJson = string.Join("", createStdout); + var udid = System.Text.Json.JsonDocument.Parse(createJson).RootElement.GetProperty("udid").GetString(); + Information(" Created simulator with UDID: {0}", udid); - // find the .app bundle - var appBundles = GetDirectories ($"{outputDir}/*.app"); - if (!appBundles.Any ()) - throw new Exception ($"No .app bundle found in {outputDir}"); - var app = appBundles.First (); - Information ("Found app bundle: {0}", app); + // Boot by UDID + DotNetTool($"apple simulator boot \"{udid}\" --wait"); + Information(" Simulator booted"); - // determine xharness device target - var device = platform == "maccatalyst" - ? "maccatalyst" - : $"{platform}-simulator-64"; + FilePath csproj = $"{ROOT_PATH}/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj"; + DirectoryPath results = $"{ROOT_PATH}/output/logs/testlogs/SkiaSharp.Tests.Devices.ios/{DATE_TIME_STR}"; - // run xharness - DirectoryPath results = $"{ROOT_PATH}/output/logs/testlogs/SkiaSharp.Tests.Devices.{platform}/{DATE_TIME_STR}"; - CleanDirectories(results.FullPath); + // Pass the simulator UDID to DeviceRunners so it targets the correct device + var properties = new Dictionary { + { "DeviceRunnersDevice", udid }, + }; - try { - DotNetTool("xharness apple test " + - $"--app=\"{app}\" " + - $"--targets=\"{device}\" " + - $"--output-directory=\"{results}\" " + - $"--verbosity=\"Debug\" "); - } finally { - // ios test result files are weirdly named, so fix it up - var resultsFile = GetFiles($"{results}/xunit-test-*.xml").FirstOrDefault(); - if (FileExists(resultsFile)) { - CopyFile(resultsFile, resultsFile.GetDirectory().CombineWithFilePath("TestResults.xml")); - } + RunDeviceRunnersTest(csproj, results, configuration: "Debug", framework: "net10.0-ios", noBuild: SKIP_BUILD, properties: properties); } - - var failed = XmlPeek($"{results}/TestResults.xml", "/assemblies/assembly[@failed > 0 or @errors > 0]/@failed"); - if (!string.IsNullOrEmpty(failed)) { - throw new Exception($"At least {failed} test(s) failed."); + finally + { + // Always clean up the simulator + Information("Deleting simulator: {0}", simulatorName); + try + { + DotNetTool($"apple simulator delete --force \"{simulatorName}\""); + } + catch (Exception ex) + { + Warning($"Failed to delete simulator: {ex.Message}"); + } } -} - -Task ("tests-ios") - .Description ("Run all iOS tests.") - .Does (() => RunAppleTests("ios", "net10.0-ios")); +}); Task ("tests-maccatalyst") .Description ("Run all Mac Catalyst tests.") - .Does (() => RunAppleTests("maccatalyst", "net10.0-maccatalyst")); + .Does (() => +{ + FilePath csproj = $"{ROOT_PATH}/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj"; + DirectoryPath results = $"{ROOT_PATH}/output/logs/testlogs/SkiaSharp.Tests.Devices.maccatalyst/{DATE_TIME_STR}"; + + RunDeviceRunnersTest(csproj, results, configuration: "Debug", framework: "net10.0-maccatalyst", noBuild: SKIP_BUILD); +}); Task ("Default") .IsDependentOn ("tests-ios") diff --git a/scripts/infra/tests/tests-wasm.cake b/scripts/infra/tests/tests-wasm.cake index 68141ed2007..05bc3b301f5 100644 --- a/scripts/infra/tests/tests-wasm.cake +++ b/scripts/infra/tests/tests-wasm.cake @@ -2,30 +2,19 @@ DirectoryPath ROOT_PATH = MakeAbsolute(Directory("../../..")); #load "../shared/shared.cake" #load "../shared/msbuild.cake" +#load "test-shared.cake" //////////////////////////////////////////////////////////////////////////////////////////////////// -// WASM TESTS — build and run browser-based tests +// WASM TESTS — build and run browser-based tests via dotnet test //////////////////////////////////////////////////////////////////////////////////////////////////// Task ("Default") .Does (() => { - if (!SKIP_BUILD) { - RunDotNetBuild ($"{ROOT_PATH}/tests/SkiaSharp.Tests.Wasm.sln"); - } + FilePath csproj = $"{ROOT_PATH}/tests/SkiaSharp.Tests.Wasm/SkiaSharp.Tests.Wasm.csproj"; + DirectoryPath results = $"{ROOT_PATH}/output/logs/testlogs/SkiaSharp.Tests.Wasm/{DATE_TIME_STR}"; - IProcess serverProc = null; - try { - var wasmProj = MakeAbsolute (File ($"{ROOT_PATH}/tests/SkiaSharp.Tests.Wasm/SkiaSharp.Tests.Wasm.csproj")).FullPath; - serverProc = RunAndReturnProcess ("dotnet", $"run --project \"{wasmProj}\" --no-build -c {CONFIGURATION}"); - DotNetRun ($"{ROOT_PATH}/utils/WasmTestRunner/WasmTestRunner.csproj", - $"--output=\"{ROOT_PATH}/output/logs/testlogs/SkiaSharp.Tests.Wasm/{DATE_TIME_STR}/\" " + - (string.IsNullOrEmpty (CHROMEWEBDRIVER) ? "" : $"--driver=\"{CHROMEWEBDRIVER}\" ") + - "--verbose " + - "\"http://127.0.0.1:8000/\" "); - } finally { - serverProc?.Kill (); - } + RunDeviceRunnersTest(csproj, results, noBuild: SKIP_BUILD); }); RunTarget(TARGET); diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 7498a48e823..9b9ea346879 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -2,4 +2,8 @@ + + false + + \ No newline at end of file diff --git a/tests/SkiaSharp.Tests.Devices/MauiProgram.cs b/tests/SkiaSharp.Tests.Devices/MauiProgram.cs index 7ad34246f48..a3a9d7d4c7a 100644 --- a/tests/SkiaSharp.Tests.Devices/MauiProgram.cs +++ b/tests/SkiaSharp.Tests.Devices/MauiProgram.cs @@ -1,6 +1,5 @@ using DeviceRunners.UITesting; using DeviceRunners.VisualRunners; -using DeviceRunners.XHarness; using Microsoft.Extensions.Logging; using Microsoft.Maui.Hosting; using SkiaSharp.Views.Maui.Controls.Hosting; @@ -26,12 +25,9 @@ public static MauiApp CreateMauiApp() builder .UseSkiaSharp() .ConfigureUITesting() - .UseXHarnessTestRunner(conf => conf - .AddTestAssemblies(testAssemblies) - .AddXunit() - .SkipCategory(Traits.FailingOn.Key, Traits.FailingOn.Values.GetCurrent()) - .SkipCategory(Traits.SkipOn.Key, Traits.SkipOn.Values.GetCurrent())) .UseVisualTestRunner(conf => conf + .AddCliConfiguration() + .AddConsoleResultChannel() .AddTestAssemblies(testAssemblies) .AddXunit()); diff --git a/tests/SkiaSharp.Tests.Devices/Platforms/Android/AndroidManifest.xml b/tests/SkiaSharp.Tests.Devices/Platforms/Android/AndroidManifest.xml index a4f8550d786..5bb00d03f7c 100644 --- a/tests/SkiaSharp.Tests.Devices/Platforms/Android/AndroidManifest.xml +++ b/tests/SkiaSharp.Tests.Devices/Platforms/Android/AndroidManifest.xml @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/tests/SkiaSharp.Tests.Devices/Platforms/Android/MainActivity.cs b/tests/SkiaSharp.Tests.Devices/Platforms/Android/MainActivity.cs index 2b6273896bb..ea9631e7d32 100644 --- a/tests/SkiaSharp.Tests.Devices/Platforms/Android/MainActivity.cs +++ b/tests/SkiaSharp.Tests.Devices/Platforms/Android/MainActivity.cs @@ -4,7 +4,7 @@ namespace SkiaSharp.Tests { - [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)] + [Activity(Name = "com.companyname.SkiaSharpTests.MainActivity", Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)] public class MainActivity : MauiAppCompatActivity { } diff --git a/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj b/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj index 4c6c6b3f557..f8fae3c1f95 100644 --- a/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj +++ b/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj @@ -12,6 +12,7 @@ true true $(DefineConstants);USE_LIBRARY_IMPORT + false @@ -33,12 +34,11 @@ - - - - - - + + + + + diff --git a/tests/SkiaSharp.Tests.Wasm/Program.cs b/tests/SkiaSharp.Tests.Wasm/Program.cs index bb50235b08a..1aa7b4f5736 100644 --- a/tests/SkiaSharp.Tests.Wasm/Program.cs +++ b/tests/SkiaSharp.Tests.Wasm/Program.cs @@ -1,5 +1,22 @@ -var testRunner = new Xunit.Sdk.ThreadlessXunitTestRunner(); +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; -var result = testRunner.Run(typeof(Program).Assembly.GetName().Name + ".dll", []); +using DeviceRunners.VisualRunners; +using DeviceRunners.VisualRunners.Blazor.Components; -return result ? 1 : 0; +using SkiaSharp.Tests; +using SkiaSharp.Tests.Wasm; + +// Configure test paths for WASM VFS +TestConfig.Current = new WasmTestConfig(); + +var builder = WebAssemblyHostBuilder.CreateDefault(args); + +builder.RootComponents.Add("#app"); + +builder.UseVisualTestRunner(conf => conf + .AddXunit(useReflection: true) + .AddTestAssembly(typeof(WasmTests).Assembly) + .AddTestAssembly(typeof(SKPaintTest).Assembly) + .AddConsoleResultChannel()); + +await builder.Build().RunAsync(); diff --git a/tests/SkiaSharp.Tests.Wasm/Properties/launchSettings.json b/tests/SkiaSharp.Tests.Wasm/Properties/launchSettings.json deleted file mode 100644 index 8e1d60eb0c3..00000000000 --- a/tests/SkiaSharp.Tests.Wasm/Properties/launchSettings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "profiles": { - "SkiaSharp.Tests.Wasm": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:8001;http://localhost:8000", - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - } - } -} diff --git a/tests/SkiaSharp.Tests.Wasm/SkiaSharp.Tests.Wasm.csproj b/tests/SkiaSharp.Tests.Wasm/SkiaSharp.Tests.Wasm.csproj index c97d7c64217..c82d898ab51 100644 --- a/tests/SkiaSharp.Tests.Wasm/SkiaSharp.Tests.Wasm.csproj +++ b/tests/SkiaSharp.Tests.Wasm/SkiaSharp.Tests.Wasm.csproj @@ -1,21 +1,26 @@ - + $(TFMCurrent) true enable enable - SkiaSharp.Tests - SkiaSharp.Tests + SkiaSharp.Tests.Wasm + SkiaSharp.Tests.Wasm true true $(DefineConstants);USE_LIBRARY_IMPORT + true + true + - - + + + + @@ -25,6 +30,12 @@ + + + + + + diff --git a/tests/SkiaSharp.Tests.Wasm/Tests.cs b/tests/SkiaSharp.Tests.Wasm/Tests.cs deleted file mode 100644 index c6673e3bb61..00000000000 --- a/tests/SkiaSharp.Tests.Wasm/Tests.cs +++ /dev/null @@ -1,60 +0,0 @@ -using Xunit; -using System; -using System.Runtime.InteropServices; - -namespace SkiaSharp.Tests; - -public class PlaceholderTest -{ - private const string SKIA = "libSkiaSharp"; - private const string HARFBUZZ = "libHarfBuzzSharp"; - - [Fact] - public void CheckVersion() - { - var str = Marshal.PtrToStringAnsi(sk_version_get_string()); - var milestone = sk_version_get_milestone(); - var increment = sk_version_get_increment(); - - Assert.True(milestone > 0); - Assert.True(increment >= 0); - Assert.Equal($"{milestone}.{increment}", str); - } - - [Fact] - public void CheckHarfBuzz() - { - const uint LATIN = 1281455214; - const int LTR = 4; - - var dir = hb_script_get_horizontal_direction(LATIN); - - Assert.Equal(LTR, dir); - } - - [Fact] - public void CanSerializeAndDeserializePicture() - { - using var recorder = new SKPictureRecorder(); - using var canvas = recorder.BeginRecording(SKRect.Create(0, 0, 40, 40)); - using var picture = recorder.EndRecording(); - - using var data = picture.Serialize(); - - using var deserialized = SKPicture.Deserialize(data); - - Assert.NotNull(deserialized); - } - - [DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr sk_version_get_string(); - - [DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)] - static extern int sk_version_get_milestone(); - - [DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)] - static extern int sk_version_get_increment(); - - [DllImport(HARFBUZZ, CallingConvention = CallingConvention.Cdecl)] - static extern int hb_script_get_horizontal_direction(uint script); -} diff --git a/tests/SkiaSharp.Tests.Wasm/WasmTestConfig.cs b/tests/SkiaSharp.Tests.Wasm/WasmTestConfig.cs new file mode 100644 index 00000000000..3212e27b51b --- /dev/null +++ b/tests/SkiaSharp.Tests.Wasm/WasmTestConfig.cs @@ -0,0 +1,63 @@ +using System.IO; +using System.Reflection; + +namespace SkiaSharp.Tests.Wasm; + +public class WasmTestConfig : TestConfig +{ + public WasmTestConfig() + { + // Use /tmp as a writable VFS directory + PathRoot = "/tmp/tests"; + + // WASM has limited system font support + DefaultFontFamily = "sans-serif"; + UnicodeFontFamilies = new[] { "sans-serif" }; + + // Extract embedded resources to VFS (same pattern as device tests) + ExtractContent(); + } + + private void ExtractContent() + { + var fontsRoot = Path.Combine(PathRoot, "Content", "fonts"); + var imagesRoot = Path.Combine(PathRoot, "Content", "images"); + + Directory.CreateDirectory(fontsRoot); + Directory.CreateDirectory(imagesRoot); + + var assembly = typeof(WasmTestConfig).Assembly; + var prefix = "SkiaSharp.Tests.Wasm.Content."; + var fontsPrefix = "fonts."; + var imagesPrefix = "images."; + + foreach (var name in assembly.GetManifestResourceNames()) + { + if (!name.StartsWith(prefix)) + continue; + + var filename = name.Substring(prefix.Length); + string root; + + if (filename.StartsWith(fontsPrefix)) + { + filename = filename.Substring(fontsPrefix.Length); + root = fontsRoot; + } + else if (filename.StartsWith(imagesPrefix)) + { + filename = filename.Substring(imagesPrefix.Length); + root = imagesRoot; + } + else + { + continue; + } + + var destPath = Path.Combine(root, filename); + using var stream = assembly.GetManifestResourceStream(name); + using var dest = File.Create(destPath); + stream!.CopyTo(dest); + } + } +} diff --git a/tests/SkiaSharp.Tests.Wasm/WasmTests.cs b/tests/SkiaSharp.Tests.Wasm/WasmTests.cs new file mode 100644 index 00000000000..c870edb86ec --- /dev/null +++ b/tests/SkiaSharp.Tests.Wasm/WasmTests.cs @@ -0,0 +1,119 @@ +using System; +using System.Runtime.InteropServices; +using Xunit; + +namespace SkiaSharp.Tests.Wasm; + +public class WasmTests +{ + [Fact] + public void CheckVersion() + { + var native = SkiaSharpVersion.Native; + + Assert.True(native.Major > 0); + Assert.True(native.Minor >= 0); + } + + [Fact] + public void CheckHarfBuzz() + { + var blob = HarfBuzzSharp.Blob.Empty; + Assert.NotNull(blob); + Assert.Equal(0, blob.Length); + } + + [Fact] + public void CanCreateSurface() + { + var info = new SKImageInfo(100, 100); + using var surface = SKSurface.Create(info); + + Assert.NotNull(surface); + } + + [Fact] + public void CanDrawOnCanvas() + { + var info = new SKImageInfo(100, 100); + using var surface = SKSurface.Create(info); + var canvas = surface.Canvas; + + canvas.Clear(SKColors.White); + + using var paint = new SKPaint(); + paint.Color = SKColors.Red; + paint.IsAntialias = true; + + canvas.DrawCircle(50, 50, 25, paint); + + using var image = surface.Snapshot(); + Assert.NotNull(image); + Assert.Equal(100, image.Width); + Assert.Equal(100, image.Height); + } + + [Fact] + public void CanSerializeAndDeserializePicture() + { + using var recorder = new SKPictureRecorder(); + using var canvas = recorder.BeginRecording(SKRect.Create(0, 0, 40, 40)); + using var picture = recorder.EndRecording(); + + using var data = picture.Serialize(); + + using var deserialized = SKPicture.Deserialize(data); + + Assert.NotNull(deserialized); + } + + [Fact] + public void CanCreatePath() + { + using var builder = new SKPathBuilder(); + builder.MoveTo(0, 0); + builder.LineTo(100, 100); + builder.LineTo(0, 100); + builder.Close(); + + using var path = builder.Detach(); + + Assert.Equal(3, path.PointCount); + } + + [Fact] + public void CanCreateTypeface() + { + using var typeface = SKTypeface.Default; + Assert.NotNull(typeface); + Assert.NotNull(typeface.FamilyName); + } + + [Fact] + public void CanEncodeImage() + { + var info = new SKImageInfo(50, 50); + using var surface = SKSurface.Create(info); + surface.Canvas.Clear(SKColors.Blue); + + using var image = surface.Snapshot(); + using var data = image.Encode(SKEncodedImageFormat.Png, 100); + + Assert.NotNull(data); + Assert.True(data.Size > 0); + } + + [Fact] + public void CanCreateMatrix() + { + var matrix = SKMatrix.CreateRotation(45); + Assert.NotEqual(SKMatrix.Identity, matrix); + } + + [Fact] + public void CanCreateColorFilter() + { + using var filter = SKColorFilter.CreateBlendMode(SKColors.Red, SKBlendMode.Multiply); + Assert.NotNull(filter); + } +} diff --git a/tests/SkiaSharp.Tests.Wasm/Xunit/ThreadlessXunitTestRunner.cs b/tests/SkiaSharp.Tests.Wasm/Xunit/ThreadlessXunitTestRunner.cs deleted file mode 100644 index 726d7cd74b0..00000000000 --- a/tests/SkiaSharp.Tests.Wasm/Xunit/ThreadlessXunitTestRunner.cs +++ /dev/null @@ -1,166 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Runtime.InteropServices.JavaScript; -using System.Text; -using System.Xml.Linq; -using Xunit; -using Xunit.Abstractions; - -namespace Xunit.Sdk; - -internal partial class ThreadlessXunitTestRunner -{ - [JSImport("xunit.sdk.runner.clearLog", "main.js")] - internal static partial void ClearLog(); - - [JSImport("xunit.sdk.runner.log", "main.js")] - internal static partial void Log(string? message, string? type = null, string? id = null); - - [JSImport("xunit.sdk.runner.logResults", "main.js")] - internal static partial void LogResults(string results); - - public bool Run(string assemblyFileName, IEnumerable excludedTraits) - { - ClearLog(); - - Log("Starting tests..."); - - var filters = new XunitFilters(); - foreach (var trait in excludedTraits ?? Array.Empty()) - { - ParseEqualSeparatedArgument(filters.ExcludedTraits, trait); - } - - var configuration = new TestAssemblyConfiguration - { - ShadowCopy = false, - ParallelizeAssembly = false, - ParallelizeTestCollections = false, - MaxParallelThreads = 1, - PreEnumerateTheories = false - }; - var discoveryOptions = TestFrameworkOptions.ForDiscovery(configuration); - var discoverySink = new TestDiscoverySink(); - var diagnosticSink = new ConsoleDiagnosticMessageSink(); - var testOptions = TestFrameworkOptions.ForExecution(configuration); - var testSink = new TestMessageSink(); - var controller = new Xunit2( - AppDomainSupport.Denied, - new NullSourceInformationProvider(), - assemblyFileName, - configFileName: null, - shadowCopy: false, - shadowCopyFolder: null, - diagnosticMessageSink: diagnosticSink, - verifyTestAssemblyExists: false); - - discoveryOptions.SetSynchronousMessageReporting(true); - testOptions.SetSynchronousMessageReporting(true); - - Log($"Discovering tests for {assemblyFileName}..."); - var assembly = Assembly.LoadFrom(assemblyFileName); - var assemblyInfo = new Xunit.Sdk.ReflectionAssemblyInfo(assembly); - var discoverer = new ThreadlessXunitDiscoverer(assemblyInfo, new NullSourceInformationProvider(), discoverySink); - discoverer.FindWithoutThreads(includeSourceInformation: false, discoverySink, discoveryOptions); - discoverySink.Finished.WaitOne(); - var testCasesToRun = discoverySink.TestCases.Where(filters.Filter).ToList(); - Log($"Discovered tests for {assemblyFileName}: Total: {discoverySink.TestCases.Count}, Skip: {discoverySink.TestCases.Count - testCasesToRun.Count}, Run: {testCasesToRun.Count}."); - Log($"Test discovery finished."); - Log(""); - - var summarySink = new DelegatingExecutionSummarySink( - testSink, - () => false, - (completed, summary) => - { - Log($""" - Tests run: {summary.Total}, Errors: 0, Failures: {summary.Failed}, Skipped: {summary.Skipped}. - Total duration: {TimeSpan.FromSeconds((double)summary.Time).TotalSeconds}s - """); - }); - - var resultsXmlAssembly = new XElement("assembly"); - var resultsSink = new DelegatingXmlCreationSink(summarySink, resultsXmlAssembly); - - testSink.Execution.TestPassedEvent += args => { Log($"[PASS] {args.Message.Test.DisplayName}", type: "pass"); }; - testSink.Execution.TestSkippedEvent += args => { Log($"[SKIP] {args.Message.Test.DisplayName}", type: "skip"); }; - testSink.Execution.TestFailedEvent += args => - { - Log($""" - [FAIL] {args.Message.Test.DisplayName} - {ExceptionUtility.CombineMessages(args.Message)} - {ExceptionUtility.CombineStackTraces(args.Message)} - """, type: "fail"); - }; - - testSink.Execution.TestAssemblyStartingEvent += args => { Log($"Running tests for {args.Message.TestAssembly.Assembly}..."); }; - testSink.Execution.TestAssemblyFinishedEvent += args => { Log($"Finished running tests for {args.Message.TestAssembly.Assembly}."); }; - - controller.RunTests(testCasesToRun, resultsSink, testOptions); - resultsSink.Finished.WaitOne(); - - var resultsXml = new XElement("assemblies"); - resultsXml.Add(resultsXmlAssembly); - - Console.WriteLine(resultsXml.ToString()); - - Log(""); - Log("Test results (Base64 encoded):"); - var base64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(resultsXml.ToString())); - Console.WriteLine(base64); - LogResults(base64); - - return resultsSink.ExecutionSummary.Failed > 0 || resultsSink.ExecutionSummary.Errors > 0; - } - - private void ParseEqualSeparatedArgument(Dictionary> targetDictionary, string argument) - { - var parts = argument.Split('='); - if (parts.Length != 2 || string.IsNullOrEmpty(parts[0]) || string.IsNullOrEmpty(parts[1])) - throw new ArgumentException("Invalid argument value '{argument}'.", nameof(argument)); - - var name = parts[0]; - var value = parts[1]; - - List excludedTraits; - if (targetDictionary.TryGetValue(name, out excludedTraits!)) - excludedTraits.Add(value); - else - targetDictionary[name] = new List { value }; - } -} - -internal class ThreadlessXunitDiscoverer : Xunit.Sdk.XunitTestFrameworkDiscoverer -{ - public ThreadlessXunitDiscoverer(IAssemblyInfo assemblyInfo, ISourceInformationProvider sourceProvider, IMessageSink diagnosticMessageSink) - : base(assemblyInfo, sourceProvider, diagnosticMessageSink) - { - } - - public void FindWithoutThreads(bool includeSourceInformation, IMessageSink discoveryMessageSink, ITestFrameworkDiscoveryOptions discoveryOptions) - { - using var messageBus = new Xunit.Sdk.SynchronousMessageBus(discoveryMessageSink); - - foreach (var type in AssemblyInfo.GetTypes(includePrivateTypes: false).Where(IsValidTestClass)) - { - var testClass = CreateTestClass(type); - if (!FindTestsForType(testClass, includeSourceInformation, messageBus, discoveryOptions)) - break; - } - - messageBus.QueueMessage(new Xunit.Sdk.DiscoveryCompleteMessage()); - } -} - -internal class ConsoleDiagnosticMessageSink : Xunit.Sdk.LongLivedMarshalByRefObject, IMessageSink -{ - public bool OnMessage(IMessageSinkMessage message) - { - if (message is IDiagnosticMessage diagnosticMessage) - Console.WriteLine(diagnosticMessage.Message); - - return true; - } -} diff --git a/tests/SkiaSharp.Tests.Wasm/runtimeconfig.template.json b/tests/SkiaSharp.Tests.Wasm/runtimeconfig.template.json deleted file mode 100644 index b96a94320ba..00000000000 --- a/tests/SkiaSharp.Tests.Wasm/runtimeconfig.template.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "wasmHostProperties": { - "perHostConfig": [ - { - "name": "browser", - "host": "browser" - } - ] - } -} \ No newline at end of file diff --git a/tests/SkiaSharp.Tests.Wasm/wwwroot/index.html b/tests/SkiaSharp.Tests.Wasm/wwwroot/index.html index 271805aad8f..284c9200346 100644 --- a/tests/SkiaSharp.Tests.Wasm/wwwroot/index.html +++ b/tests/SkiaSharp.Tests.Wasm/wwwroot/index.html @@ -1,16 +1,27 @@ - + - SkiaSharp.Tests - - - - + + + SkiaSharp WASM Tests + + + + - 
Loading tests...
+
+
+ Loading test runner... +
+
+ + + diff --git a/tests/SkiaSharp.Tests.Wasm/wwwroot/main.css b/tests/SkiaSharp.Tests.Wasm/wwwroot/main.css deleted file mode 100644 index 6ab89a01085..00000000000 --- a/tests/SkiaSharp.Tests.Wasm/wwwroot/main.css +++ /dev/null @@ -1,20 +0,0 @@ -body { - font-family: Consolas, 'Courier New', Courier, monospace; - white-space: pre-wrap; - word-break: break-all; - padding: 1em; -} - -.test-fail { - color: red; -} -.test-skip { - color: orange; -} -.test-pass { - color: green; -} - -.test-results { - color: black; -} diff --git a/tests/SkiaSharp.Tests.Wasm/wwwroot/main.js b/tests/SkiaSharp.Tests.Wasm/wwwroot/main.js deleted file mode 100644 index 78b6cd37c1a..00000000000 --- a/tests/SkiaSharp.Tests.Wasm/wwwroot/main.js +++ /dev/null @@ -1,54 +0,0 @@ -import { dotnet } from './_framework/dotnet.js' - -const { setModuleImports } = await dotnet - .withDiagnosticTracing(false) - .withApplicationArgumentsFromQuery() - .create(); - -setModuleImports('main.js', { - xunit: { - sdk: { - runner: { - clearLog: () => { - var doc = globalThis.document; - if (!doc) - return; - - doc.body.innerHTML = '' - }, - log: (message, type, id) => { - var doc = globalThis.document; - if (!doc) - return; - - if (!message) - message = ' '; - message.replace('\r\n', '
'); - message.replace('\n', '
'); - - var attributes = ''; - if (id) - attributes += 'id="' + id + '" '; - if (type) - attributes += 'class="test-' + type + '" '; - - doc.body.innerHTML += '

' + message + '

'; - }, - logResults: (results) => { - var doc = globalThis.document; - if (!doc) - return; - - if (!results) - results = 'No test results.'; - results.replace('\r\n', '
'); - results.replace('\n', '
'); - - doc.body.innerHTML += '

' + results + '

'; - } - } - } - } -}); - -await dotnet.run(); diff --git a/tests/Tests/BaseTest.cs b/tests/Tests/BaseTest.cs index 7513c09939d..1b5958ec952 100644 --- a/tests/Tests/BaseTest.cs +++ b/tests/Tests/BaseTest.cs @@ -63,9 +63,16 @@ public static void CollectGarbage() false; #endif + protected static bool IsBrowser => +#if NET5_0_OR_GREATER + OperatingSystem.IsBrowser(); +#else + false; +#endif + protected static void SkipOnMono(string reason = "Mono does not guarantee finalizers are invoked immediately") { - Skip.If(IsAndroid || IsIOS || IsMacCatalyst, reason); + Skip.If(IsAndroid || IsIOS || IsMacCatalyst || IsBrowser, reason); } protected static void SkipOnNonWindows(string reason = "Exceptions cannot be thrown in native delegates on non-Windows platforms") diff --git a/tests/Tests/SkiaSharp/GRGlInterfaceTest.cs b/tests/Tests/SkiaSharp/GRGlInterfaceTest.cs index 6b8ab054110..e406af95ae5 100644 --- a/tests/Tests/SkiaSharp/GRGlInterfaceTest.cs +++ b/tests/Tests/SkiaSharp/GRGlInterfaceTest.cs @@ -11,6 +11,7 @@ public class GRGlInterfaceTest : SKTest public void InterfaceConstructionWithoutContextDoesNotCrash() { SkipOnPlatform(IsIOS || IsMacCatalyst, "GRGlInterface construction without context crashes on iOS/MacCatalyst"); + SkipOnPlatform(IsBrowser, "GRGlInterface native call aborts the WASM runtime without a WebGL canvas"); var glInterface = GRGlInterface.Create(); diff --git a/tests/Tests/SkiaSharp/SKBitmapTest.cs b/tests/Tests/SkiaSharp/SKBitmapTest.cs index b83d8cfd7ac..adcf54cba78 100644 --- a/tests/Tests/SkiaSharp/SKBitmapTest.cs +++ b/tests/Tests/SkiaSharp/SKBitmapTest.cs @@ -35,6 +35,7 @@ public void CanCopyToIsCorrect(SKColorType colorType) [MemberData(nameof(GetAllColorTypes))] public void CopyToSucceeds(SKColorType colorType) { + if (colorType == SKColorType.Bgr101010xXR || colorType == SKColorType.Bgra10101010XR) throw new SkipException("The Bgr101010xXR and Bgra10101010XR do not support getting pixel colors."); @@ -57,7 +58,7 @@ public void CopyToSucceeds(SKColorType colorType) var color = copy.GetPixel(10, 10); Assert.NotEqual(SKColors.Empty, color); if (colorType == SKColorType.Gray8) - Assert.Equal(0xFF353535, color); + AssertSimilarColor(0xFF353535, color, tolerance: 1); else if (colorType == SKColorType.Alpha8 || colorType == SKColorType.AlphaF16 || colorType == SKColorType.Alpha16) Assert.Equal(0xFF000000, color); else @@ -69,6 +70,7 @@ public void CopyToSucceeds(SKColorType colorType) [MemberData(nameof(GetAllColorTypes))] public void CopyWithAlphaToSucceeds(SKColorType colorType) { + if (colorType == SKColorType.Bgr101010xXR || colorType == SKColorType.Bgra10101010XR) throw new SkipException("The Bgr101010xXR and Bgra10101010XR do not support getting pixel colors."); @@ -93,7 +95,7 @@ public void CopyWithAlphaToSucceeds(SKColorType colorType) if (colorType == SKColorType.Gray8) { - Assert.Equal((SKColor)0xFF232323, color); + AssertSimilarColor((SKColor)0xFF232323, color, tolerance: 1); } else if (alphaType == SKAlphaType.Opaque) { diff --git a/tests/Tests/SkiaSharp/SKFontManagerTest.cs b/tests/Tests/SkiaSharp/SKFontManagerTest.cs index 89858db30b1..72f339a6880 100644 --- a/tests/Tests/SkiaSharp/SKFontManagerTest.cs +++ b/tests/Tests/SkiaSharp/SKFontManagerTest.cs @@ -10,6 +10,8 @@ public class SKFontManagerTest : SKTest [SkippableFact] public void TestFontManagerMatchCharacter() { + SkipOnPlatform(IsBrowser, "WASM has no system font manager"); + var fonts = SKFontManager.Default; var emoji = "🚀"; var emojiChar = StringUtilities.GetUnicodeCharacterCode(emoji, SKTextEncoding.Utf32); @@ -49,6 +51,8 @@ public void TestFamilyCount() [SkippableFact] public void TestGetFontStyles() { + SkipOnPlatform(IsBrowser, "WASM has no system font manager"); + var fonts = SKFontManager.Default; var set = fonts.GetFontStyles(DefaultFontFamily); @@ -60,6 +64,8 @@ public void TestGetFontStyles() [SkippableFact] public void TestMatchFamilyStyle() { + SkipOnPlatform(IsBrowser, "WASM has no system font manager"); + var fonts = SKFontManager.Default; var tf = fonts.MatchFamily(DefaultFontFamily, SKFontStyle.Bold); @@ -237,6 +243,8 @@ public unsafe void FromFamilyReturnsSameObject() [SkippableFact] public unsafe void FromFamilyDisposeDoesNotDispose() { + SkipOnPlatform(IsBrowser, "WASM has no system font manager"); + var fonts = SKFontManager.Default; var tf1 = fonts.MatchFamily(DefaultFontFamily, SKFontStyle.Normal); @@ -253,6 +261,8 @@ public unsafe void FromFamilyDisposeDoesNotDispose() [SkippableFact] public unsafe void TypefaceAndFontManagerReturnsSameObject() { + SkipOnPlatform(IsBrowser, "WASM has no system font manager"); + var fonts = SKFontManager.Default; // Use a font family known to exist on the current platform diff --git a/tests/Tests/SkiaSharp/SKFontStyleSetTest.cs b/tests/Tests/SkiaSharp/SKFontStyleSetTest.cs index d68aed78015..87342ae4050 100644 --- a/tests/Tests/SkiaSharp/SKFontStyleSetTest.cs +++ b/tests/Tests/SkiaSharp/SKFontStyleSetTest.cs @@ -27,6 +27,8 @@ public void TestFindsNothing() [SkippableFact] public void TestSetHasAtLeastOne() { + SkipOnPlatform(IsBrowser, "WASM has no system font manager"); + var fonts = SKFontManager.Default; var set = fonts.GetFontStyles(DefaultFontFamily); @@ -51,6 +53,8 @@ public void TestCanGetStyles() [SkippableFact] public void TestCanCreateBoldFromIndex() { + SkipOnPlatform(IsBrowser, "WASM has no system font manager"); + var fonts = SKFontManager.Default; var set = fonts.GetFontStyles(DefaultFontFamily); @@ -78,6 +82,8 @@ public void TestCanCreateBoldFromIndex() [SkippableFact] public void TestCanCreateBold() { + SkipOnPlatform(IsBrowser, "WASM has no system font manager"); + var fonts = SKFontManager.Default; var set = fonts.GetFontStyles(DefaultFontFamily); @@ -117,6 +123,8 @@ public void CreateTypefaceReturnsSameTypeface() [SkippableFact] public unsafe void CreateTypefaceDisposeDoesNotDispose() { + SkipOnPlatform(IsBrowser, "WASM has no system font manager"); + var fonts = SKFontManager.Default; var set = fonts.GetFontStyles(DefaultFontFamily); diff --git a/tests/Tests/SkiaSharp/SKFontTest.cs b/tests/Tests/SkiaSharp/SKFontTest.cs index 03a3f620364..37f71e7fd1a 100644 --- a/tests/Tests/SkiaSharp/SKFontTest.cs +++ b/tests/Tests/SkiaSharp/SKFontTest.cs @@ -90,6 +90,8 @@ public void PlainGlyphsReturnsTheCorrectNumberOfCharacters() [SkippableFact] public void UnicodeGlyphsReturnsTheCorrectNumberOfCharacters() { + SkipOnPlatform(IsBrowser, "WASM has no system fonts with emoji support"); + const string text = "🚀"; var emojiChar = StringUtilities.GetUnicodeCharacterCode(text, SKTextEncoding.Utf32); @@ -119,6 +121,8 @@ public void ContainsTextIsCorrect() [SkippableFact] public void ContainsUnicodeTextIsCorrect() { + SkipOnPlatform(IsBrowser, "WASM has no system fonts with emoji support"); + const string text = "🚀"; var emojiChar = StringUtilities.GetUnicodeCharacterCode(text, SKTextEncoding.Utf32); @@ -273,6 +277,8 @@ public void GetGlyphWidthsReturnsTheCorrectAmount() [SkippableFact] public void GetGlyphWidthsAreCorrect() { + SkipOnPlatform(IsBrowser, "WASM has no system fonts for glyph width measurement"); + var font = new SKFont(SKTypeface.Default); var widths = font.GetGlyphWidths("Hello World!", out var bounds); diff --git a/tests/Tests/SkiaSharp/SKImageTest.cs b/tests/Tests/SkiaSharp/SKImageTest.cs index 85a3cce9344..7d2c741fd68 100644 --- a/tests/Tests/SkiaSharp/SKImageTest.cs +++ b/tests/Tests/SkiaSharp/SKImageTest.cs @@ -503,6 +503,8 @@ void ResurrectData(SKImage img) [SkippableFact] public unsafe void DataOutLivesImageUntilFinalizersRun() { + SkipOnPlatform(IsBrowser, "WASM does not guarantee finalizers are invoked immediately"); + var released = false; var bytes = File.ReadAllBytes(Path.Combine(PathToImages, "baboon.jpg")); diff --git a/tests/Tests/SkiaSharp/SKPaintTest.cs b/tests/Tests/SkiaSharp/SKPaintTest.cs index 88f4f9e93b2..7fe3174e4e8 100644 --- a/tests/Tests/SkiaSharp/SKPaintTest.cs +++ b/tests/Tests/SkiaSharp/SKPaintTest.cs @@ -80,6 +80,7 @@ public void GetFillPathIsWorkingWithLine() public void NonAntiAliasedTextOnScaledCanvasIsCorrect() { SkipOnPlatform(IsAndroid, "TODO: figure out why the font has changed"); + SkipOnPlatform(IsBrowser, "WASM text rendering produces slightly different pixel values"); using (var bitmapAA = new SKBitmap(new SKImageInfo(200, 200))) using (var bitmapNoAA = new SKBitmap(new SKImageInfo(200, 200))) @@ -396,6 +397,8 @@ public void PlainGlyphsReturnsTheCorrectNumberOfCharacters() [SkippableFact] public void UnicodeGlyphsReturnsTheCorrectNumberOfCharacters() { + SkipOnPlatform(IsBrowser, "WASM has no system fonts with emoji support"); + const string text = "🚀"; var emojiChar = StringUtilities.GetUnicodeCharacterCode(text, SKTextEncoding.Utf32); @@ -429,6 +432,8 @@ public void ContainsTextIsCorrect() [SkippableFact] public void ContainsUnicodeTextIsCorrect() { + SkipOnPlatform(IsBrowser, "WASM has no system fonts with emoji support"); + const string text = "🚀"; var emojiChar = StringUtilities.GetUnicodeCharacterCode(text, SKTextEncoding.Utf32); @@ -557,6 +562,8 @@ public void GetGlyphWidthsReturnsTheCorrectAmount() [SkippableFact] public void GetGlyphWidthsAreCorrect() { + SkipOnPlatform(IsBrowser, "WASM has no system fonts for glyph width measurement"); + var paint = new SKPaint(); var widths = paint.GetGlyphWidths("Hello World!", out var bounds); diff --git a/tests/Tests/SkiaSharp/SKTest.cs b/tests/Tests/SkiaSharp/SKTest.cs index bb1ab53b7f3..98277a37692 100644 --- a/tests/Tests/SkiaSharp/SKTest.cs +++ b/tests/Tests/SkiaSharp/SKTest.cs @@ -198,6 +198,18 @@ protected static void AssertSimilar(ReadOnlySpan expected, ReadOnlySpan` The type containing the interops. -## WasmTestRunner -Run the WASM unit tests in a browser. - -This can be run with: - -```pwsh -dotnet run --project=utils/WasmTestRunner/WasmTestRunner.csproj -- "http://localhost:5000/" -``` - -* `--output TestResults.xml` -* `--timeout 30` -* `--no-headless` diff --git a/utils/Utils.sln b/utils/Utils.sln index 2062c282282..266a0b4520e 100644 --- a/utils/Utils.sln +++ b/utils/Utils.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29423.271 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpGenerator", "SkiaSharpGenerator\SkiaSharpGenerator.csproj", "{970EA255-F11F-4551-AEC4-6666C1192259}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WasmTestRunner", "WasmTestRunner\WasmTestRunner.csproj", "{7C7ED740-A8D2-46BE-97A0-0F8EF33833D0}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -17,10 +15,6 @@ Global {970EA255-F11F-4551-AEC4-6666C1192259}.Debug|Any CPU.Build.0 = Debug|Any CPU {970EA255-F11F-4551-AEC4-6666C1192259}.Release|Any CPU.ActiveCfg = Release|Any CPU {970EA255-F11F-4551-AEC4-6666C1192259}.Release|Any CPU.Build.0 = Release|Any CPU - {7C7ED740-A8D2-46BE-97A0-0F8EF33833D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C7ED740-A8D2-46BE-97A0-0F8EF33833D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C7ED740-A8D2-46BE-97A0-0F8EF33833D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C7ED740-A8D2-46BE-97A0-0F8EF33833D0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/utils/WasmTestRunner/Program.cs b/utils/WasmTestRunner/Program.cs deleted file mode 100644 index 362447b06f6..00000000000 --- a/utils/WasmTestRunner/Program.cs +++ /dev/null @@ -1,206 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading; -using System.Xml.Linq; -using Mono.Options; -using OpenQA.Selenium; -using OpenQA.Selenium.Chrome; -using OpenQA.Selenium.Chromium; -using OpenQA.Selenium.Edge; - -namespace WasmTestRunner -{ - public class Program - { - private const string DefaultUrl = "http://localhost:5000/"; - private const string ResultsFileName = "TestResults.xml"; - - private static string chromeDriverPath; - - public static string ChromeDriverPath - { - get => chromeDriverPath; - set - { - chromeDriverPath = value; - var fname = Path.GetFileNameWithoutExtension(chromeDriverPath); - if (fname.Equals("msedgedriver", StringComparison.OrdinalIgnoreCase)) - UseEdge = true; - } - } - - public static string OutputPath { get; set; } = Directory.GetCurrentDirectory(); - - public static int Timeout { get; set; } = 30; - - public static bool UseHeadless { get; set; } = true; - - public static bool UseEdge { get; set; } - - public static bool ShowHelp { get; set; } - - public static bool Verbose { get; set; } - - public static string Url { get; set; } = DefaultUrl; - - public static int Main(string[] args) - { - var p = new OptionSet - { - { "d|driver=", "the path to the ChromeDriver executable. Default is use the local version.", v => ChromeDriverPath = v }, - { "o|output=", "the path to the test results file. Default is the current directory.", v => OutputPath = v }, - { "t|timeout=", "the number of seconds to wait before timing out. Default is 30.", (int v) => Timeout = v }, - { "no-headless", "do not use a headless browser.", v => UseHeadless = false }, - { "v|verbose", "show verbose error messages.", v => Verbose= true }, - { "h|help", "show this message and exit.", v => ShowHelp = true }, - }; - - List extra; - try - { - extra = p.Parse(args); - - if (extra.Count > 1) - throw new OptionException("To many extras provided.", "extras"); - - Url = extra.FirstOrDefault() ?? DefaultUrl; - if (string.IsNullOrEmpty(OutputPath)) - OutputPath = Directory.GetCurrentDirectory(); - OutputPath = Path.Combine(OutputPath, ResultsFileName); - var dir = Path.GetDirectoryName(OutputPath); - if (!string.IsNullOrEmpty(dir)) - Directory.CreateDirectory(dir); - } - catch (OptionException ex) - { - Console.Error.Write("wasm-test: "); - Console.Error.WriteLine(ex.Message); - Console.Error.WriteLine("Try `wasm-test --help' for more information."); - if (Verbose) - Console.Error.WriteLine(ex); - - return 1; - } - - if (ShowHelp) - { - Console.WriteLine("Usage: wasm-test [OPTIONS]+ URL"); - Console.WriteLine("Run WASM tests in the browser."); - Console.WriteLine(); - Console.WriteLine("Options:"); - p.WriteOptionDescriptions(Console.Out); - - return 0; - } - - try - { - RunTests(); - - var xdoc = XDocument.Load(OutputPath); - var failed = xdoc.Root.Element("assembly").Attribute("failed").Value; - if (failed != "0") - throw new Exception($"There were test failures: {failed}"); - } - catch (Exception ex) - { - Console.Error.WriteLine($"There was an error running the tests: {ex.Message}"); - if (Verbose) - Console.Error.WriteLine(ex); - - return 1; - } - - return 0; - } - - private static ChromiumOptions CreateOptions() - { - if (UseEdge) - { - return new EdgeOptions(); - } - else - { - return new ChromeOptions(); - } - } - - private static (ChromiumDriverService Service, ChromiumDriver Driver) CreateDriver(ChromiumOptions options) - { - if (UseEdge) - { - var service = string.IsNullOrEmpty(ChromeDriverPath) - ? EdgeDriverService.CreateDefaultService() - : EdgeDriverService.CreateDefaultService(ChromeDriverPath); - var driver = new EdgeDriver(service, (EdgeOptions)options); - return (service, driver); - } - else - { - var service = string.IsNullOrEmpty(ChromeDriverPath) - ? ChromeDriverService.CreateDefaultService() - : ChromeDriverService.CreateDefaultService(ChromeDriverPath); - var driver = new ChromeDriver(service, (ChromeOptions)options); - return (service, driver); - } - } - - private static void RunTests() - { - var options = CreateOptions(); - if (UseHeadless) - { - options.AddArgument("no-sandbox"); - options.AddArgument("headless"); - } - - options.AddArgument("window-size=1024x768"); - - var (service, driver) = CreateDriver(options); - using var _ = service; - using var __ = driver; - - driver.Url = Url; - - var index = 0; - var currentTimeout = Timeout; - - do - { - var pre = driver.FindElements(By.TagName("PRE")).Skip(index).ToArray(); - if (pre.Length > 0) - { - index += pre.Length; - currentTimeout = Timeout; // reset the timeout - - foreach (var e in pre) - Console.WriteLine(e.Text); - } - - var resultsElement = driver.FindElements(By.Id("results")); - if (resultsElement.Count == 0) - { - if (driver.FindElements(By.ClassName("neterror")).Count > 0) - { - var errorCode = driver.FindElements(By.ClassName("error-code")).FirstOrDefault()?.Text; - throw new Exception($"There was an error loading the page: {errorCode}"); - } - - Thread.Sleep(500); - continue; - } - - var text = resultsElement[0].Text; - var bytes = Convert.FromBase64String(text); - File.WriteAllBytes(OutputPath, bytes); - break; - } while (--currentTimeout > 0); - - if (currentTimeout <= 0) - throw new TimeoutException(); - } - } -} diff --git a/utils/WasmTestRunner/WasmTestRunner.csproj b/utils/WasmTestRunner/WasmTestRunner.csproj deleted file mode 100644 index 30dbf287535..00000000000 --- a/utils/WasmTestRunner/WasmTestRunner.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - Exe - net10.0 - wasm-test - - - - - - - - - \ No newline at end of file