Merge pull request #81 from Muckenbatscher/test-generation

Muckenbatscher · web-flow · commit 4e3e6f713bdd · 2026-04-12T01:25:50.000+02:00
Updated autogenerated testcases
diff --git a/.official-commit-sha b/.official-commit-sha
@@ -1 +1 @@
-91da30d89e70c3dc9575ec71a1ebe8874d881f29
+1a34bd2d696a5dd669beca679546ad72209d0937
diff --git a/MaterialTheming.Tests/KnownTestThemes/Expressive/LightMode_HighContrast_Spec2025_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/Expressive/LightMode_HighContrast_Spec2025_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_HighContrast_Spec2025_Yellow : ITestTheme
     public string ErrorContainer => "#9F3015";
     public string OnErrorContainer => "#FFFFFF";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FFFDE8";
     public string SurfaceVariant => "#EFED85";
     public string OnSurface => "#000000";
     public string OnSurfaceVariant => "#2C2C00";
     public string SurfaceDim => "#EAE86D";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FFFDE8";
     public string SurfaceTint => "#2C2C00";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FFFDE8";
     public string OnBackground => "#000000";
     // Outline
     public string Outline => "#4B4A00";
diff --git a/MaterialTheming.Tests/KnownTestThemes/Expressive/LightMode_HighContrast_Spec2026_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/Expressive/LightMode_HighContrast_Spec2026_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_HighContrast_Spec2026_Yellow : ITestTheme
     public string ErrorContainer => "#9F3015";
     public string OnErrorContainer => "#FFFFFF";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FFFDE8";
     public string SurfaceVariant => "#EFED85";
     public string OnSurface => "#000000";
     public string OnSurfaceVariant => "#2C2C00";
     public string SurfaceDim => "#EAE86D";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FFFDE8";
     public string SurfaceTint => "#2C2C00";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FFFDE8";
     public string OnBackground => "#000000";
     // Outline
     public string Outline => "#4B4A00";
diff --git a/MaterialTheming.Tests/KnownTestThemes/Expressive/LightMode_MediumContrast_Spec2025_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/Expressive/LightMode_MediumContrast_Spec2025_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_MediumContrast_Spec2025_Yellow : ITestTheme
     public string ErrorContainer => "#C74C2F";
     public string OnErrorContainer => "#FFFFFF";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FFFDE8";
     public string SurfaceVariant => "#EFED85";
     public string OnSurface => "#2C2C00";
     public string OnSurfaceVariant => "#4B4A00";
     public string SurfaceDim => "#EAE86D";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FFFDE8";
     public string SurfaceTint => "#3E3D00";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FFFDE8";
     public string OnBackground => "#2C2C00";
     // Outline
     public string Outline => "#69670A";
diff --git a/MaterialTheming.Tests/KnownTestThemes/Expressive/LightMode_MediumContrast_Spec2026_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/Expressive/LightMode_MediumContrast_Spec2026_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_MediumContrast_Spec2026_Yellow : ITestTheme
     public string ErrorContainer => "#C74C2F";
     public string OnErrorContainer => "#FFFFFF";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FFFDE8";
     public string SurfaceVariant => "#EFED85";
     public string OnSurface => "#2C2C00";
     public string OnSurfaceVariant => "#4B4A00";
     public string SurfaceDim => "#EAE86D";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FFFDE8";
     public string SurfaceTint => "#3E3D00";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FFFDE8";
     public string OnBackground => "#2C2C00";
     // Outline
     public string Outline => "#69670A";
diff --git a/MaterialTheming.Tests/KnownTestThemes/Expressive/LightMode_NormalContrast_Spec2025_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/Expressive/LightMode_NormalContrast_Spec2025_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_NormalContrast_Spec2025_Yellow : ITestTheme
     public string ErrorContainer => "#FA7150";
     public string OnErrorContainer => "#671200";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FFFDE8";
     public string SurfaceVariant => "#EFED85";
     public string OnSurface => "#3B3A00";
     public string OnSurfaceVariant => "#69670A";
     public string SurfaceDim => "#EAE86D";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FFFDE8";
     public string SurfaceTint => "#3E3D00";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FFFDE8";
     public string OnBackground => "#3B3A00";
     // Outline
     public string Outline => "#868429";
diff --git a/MaterialTheming.Tests/KnownTestThemes/Expressive/LightMode_NormalContrast_Spec2026_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/Expressive/LightMode_NormalContrast_Spec2026_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_NormalContrast_Spec2026_Yellow : ITestTheme
     public string ErrorContainer => "#FA7150";
     public string OnErrorContainer => "#671200";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FFFDE8";
     public string SurfaceVariant => "#EFED85";
     public string OnSurface => "#3B3A00";
     public string OnSurfaceVariant => "#69670A";
     public string SurfaceDim => "#EAE86D";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FFFDE8";
     public string SurfaceTint => "#3E3D00";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FFFDE8";
     public string OnBackground => "#3B3A00";
     // Outline
     public string Outline => "#868429";
diff --git a/MaterialTheming.Tests/KnownTestThemes/Neutral/LightMode_HighContrast_Spec2025_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/Neutral/LightMode_HighContrast_Spec2025_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_HighContrast_Spec2025_Yellow : ITestTheme
     public string ErrorContainer => "#943B25";
     public string OnErrorContainer => "#FFFFFF";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FEFCFA";
     public string SurfaceVariant => "#EBE8E1";
     public string OnSurface => "#000000";
     public string OnSurfaceVariant => "#2B2A26";
     public string SurfaceDim => "#E6E2DA";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FEFCFA";
     public string SurfaceTint => "#2B2B1F";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FEFCFA";
     public string OnBackground => "#000000";
     // Outline
     public string Outline => "#494843";
diff --git a/MaterialTheming.Tests/KnownTestThemes/Neutral/LightMode_HighContrast_Spec2026_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/Neutral/LightMode_HighContrast_Spec2026_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_HighContrast_Spec2026_Yellow : ITestTheme
     public string ErrorContainer => "#943B25";
     public string OnErrorContainer => "#FFFFFF";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FEFCFA";
     public string SurfaceVariant => "#EBE8E1";
     public string OnSurface => "#000000";
     public string OnSurfaceVariant => "#2B2A26";
     public string SurfaceDim => "#E6E2DA";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FEFCFA";
     public string SurfaceTint => "#2B2B1F";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FEFCFA";
     public string OnBackground => "#000000";
     // Outline
     public string Outline => "#494843";
diff --git a/MaterialTheming.Tests/KnownTestThemes/Neutral/LightMode_MediumContrast_Spec2025_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/Neutral/LightMode_MediumContrast_Spec2025_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_MediumContrast_Spec2025_Yellow : ITestTheme
     public string ErrorContainer => "#BA573F";
     public string OnErrorContainer => "#FFFFFF";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FEFCFA";
     public string SurfaceVariant => "#EBE8E1";
     public string OnSurface => "#2B2A26";
     public string OnSurfaceVariant => "#494843";
     public string SurfaceDim => "#E6E2DA";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FEFCFA";
     public string SurfaceTint => "#4A483B";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FEFCFA";
     public string OnBackground => "#2B2A26";
     // Outline
     public string Outline => "#66645F";
diff --git a/MaterialTheming.Tests/KnownTestThemes/Neutral/LightMode_MediumContrast_Spec2026_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/Neutral/LightMode_MediumContrast_Spec2026_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_MediumContrast_Spec2026_Yellow : ITestTheme
     public string ErrorContainer => "#BA573F";
     public string OnErrorContainer => "#FFFFFF";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FEFCFA";
     public string SurfaceVariant => "#EBE8E1";
     public string OnSurface => "#2B2A26";
     public string OnSurfaceVariant => "#494843";
     public string SurfaceDim => "#E6E2DA";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FEFCFA";
     public string SurfaceTint => "#4A483B";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FEFCFA";
     public string OnBackground => "#2B2A26";
     // Outline
     public string Outline => "#66645F";
diff --git a/MaterialTheming.Tests/KnownTestThemes/Neutral/LightMode_NormalContrast_Spec2025_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/Neutral/LightMode_NormalContrast_Spec2025_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_NormalContrast_Spec2025_Yellow : ITestTheme
     public string ErrorContainer => "#FE8B70";
     public string OnErrorContainer => "#742410";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FEFCFA";
     public string SurfaceVariant => "#EBE8E1";
     public string OnSurface => "#393833";
     public string OnSurfaceVariant => "#66645F";
     public string SurfaceDim => "#E6E2DA";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FEFCFA";
     public string SurfaceTint => "#605F51";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FEFCFA";
     public string OnBackground => "#393833";
     // Outline
     public string Outline => "#82807B";
diff --git a/MaterialTheming.Tests/KnownTestThemes/Neutral/LightMode_NormalContrast_Spec2026_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/Neutral/LightMode_NormalContrast_Spec2026_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_NormalContrast_Spec2026_Yellow : ITestTheme
     public string ErrorContainer => "#FE8B70";
     public string OnErrorContainer => "#742410";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FEFCFA";
     public string SurfaceVariant => "#EBE8E1";
     public string OnSurface => "#393833";
     public string OnSurfaceVariant => "#66645F";
     public string SurfaceDim => "#E6E2DA";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FEFCFA";
     public string SurfaceTint => "#605F51";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FEFCFA";
     public string OnBackground => "#393833";
     // Outline
     public string Outline => "#82807B";
diff --git a/MaterialTheming.Tests/KnownTestThemes/TonalSpot/LightMode_HighContrast_Spec2025_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/TonalSpot/LightMode_HighContrast_Spec2025_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_HighContrast_Spec2025_Yellow : ITestTheme
     public string ErrorContainer => "#9C331A";
     public string OnErrorContainer => "#FFFFFF";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FEFCF7";
     public string SurfaceVariant => "#ECE9D5";
     public string OnSurface => "#000000";
     public string OnSurfaceVariant => "#2B2B1E";
     public string SurfaceDim => "#E6E3D0";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FEFCF7";
     public string SurfaceTint => "#2C2C00";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FEFCF7";
     public string OnBackground => "#000000";
     // Outline
     public string Outline => "#4A483A";
diff --git a/MaterialTheming.Tests/KnownTestThemes/TonalSpot/LightMode_HighContrast_Spec2026_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/TonalSpot/LightMode_HighContrast_Spec2026_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_HighContrast_Spec2026_Yellow : ITestTheme
     public string ErrorContainer => "#9C331A";
     public string OnErrorContainer => "#FFFFFF";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FEFCF7";
     public string SurfaceVariant => "#ECE9D5";
     public string OnSurface => "#000000";
     public string OnSurfaceVariant => "#2B2B1E";
     public string SurfaceDim => "#E6E3D0";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FEFCF7";
     public string SurfaceTint => "#2C2C00";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FEFCF7";
     public string OnBackground => "#000000";
     // Outline
     public string Outline => "#4A483A";
diff --git a/MaterialTheming.Tests/KnownTestThemes/TonalSpot/LightMode_MediumContrast_Spec2025_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/TonalSpot/LightMode_MediumContrast_Spec2025_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_MediumContrast_Spec2025_Yellow : ITestTheme
     public string ErrorContainer => "#C44F34";
     public string OnErrorContainer => "#FFFFFF";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FEFCF7";
     public string SurfaceVariant => "#ECE9D5";
     public string OnSurface => "#2B2B1E";
     public string OnSurfaceVariant => "#4A483A";
     public string SurfaceDim => "#E6E3D0";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FEFCF7";
     public string SurfaceTint => "#4B4A0C";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FEFCF7";
     public string OnBackground => "#2B2B1E";
     // Outline
     public string Outline => "#666556";
diff --git a/MaterialTheming.Tests/KnownTestThemes/TonalSpot/LightMode_MediumContrast_Spec2026_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/TonalSpot/LightMode_MediumContrast_Spec2026_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_MediumContrast_Spec2026_Yellow : ITestTheme
     public string ErrorContainer => "#C44F34";
     public string OnErrorContainer => "#FFFFFF";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FEFCF7";
     public string SurfaceVariant => "#ECE9D5";
     public string OnSurface => "#2B2B1E";
     public string OnSurfaceVariant => "#4A483A";
     public string SurfaceDim => "#E6E3D0";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FEFCF7";
     public string SurfaceTint => "#4B4A0C";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FEFCF7";
     public string OnBackground => "#2B2B1E";
     // Outline
     public string Outline => "#666556";
diff --git a/MaterialTheming.Tests/KnownTestThemes/TonalSpot/LightMode_NormalContrast_Spec2025_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/TonalSpot/LightMode_NormalContrast_Spec2025_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_NormalContrast_Spec2025_Yellow : ITestTheme
     public string ErrorContainer => "#FD795A";
     public string OnErrorContainer => "#6E1400";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FEFCF7";
     public string SurfaceVariant => "#ECE9D5";
     public string OnSurface => "#39382B";
     public string OnSurfaceVariant => "#666556";
     public string SurfaceDim => "#E6E3D0";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FEFCF7";
     public string SurfaceTint => "#686727";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FEFCF7";
     public string OnBackground => "#39382B";
     // Outline
     public string Outline => "#838171";
diff --git a/MaterialTheming.Tests/KnownTestThemes/TonalSpot/LightMode_NormalContrast_Spec2026_Yellow.cs b/MaterialTheming.Tests/KnownTestThemes/TonalSpot/LightMode_NormalContrast_Spec2026_Yellow.cs
@@ -29,15 +29,15 @@ internal class LightMode_NormalContrast_Spec2026_Yellow : ITestTheme
     public string ErrorContainer => "#FD795A";
     public string OnErrorContainer => "#6E1400";
     // Surface
-    public string Surface => "#FFFBFF";
+    public string Surface => "#FEFCF7";
     public string SurfaceVariant => "#ECE9D5";
     public string OnSurface => "#39382B";
     public string OnSurfaceVariant => "#666556";
     public string SurfaceDim => "#E6E3D0";
-    public string SurfaceBright => "#FFFBFF";
+    public string SurfaceBright => "#FEFCF7";
     public string SurfaceTint => "#686727";
     // Background
-    public string Background => "#FFFBFF";
+    public string Background => "#FEFCF7";
     public string OnBackground => "#39382B";
     // Outline
     public string Outline => "#838171";
diff --git a/MaterialTheming/MaterialDesign/DynamicColors/ColorSpecs/ColorSpec2025.cs b/MaterialTheming/MaterialDesign/DynamicColors/ColorSpecs/ColorSpec2025.cs
@@ -972,7 +972,11 @@ public override HctColor GetHct(DynamicScheme scheme, DynamicColor color)
         double tone = GetTone(scheme, color);
         double hue = palette.Hue;
         double chromaMultiplier = color.ChromaMultiplier?.Invoke(scheme) ?? 1.0;
+        if (chromaMultiplier == 1.0)
+            return palette.GetHct(tone);
         double chroma = palette.Chroma * chromaMultiplier;
+        if (tone == 99.0 && HctColorCategorization.IsYellow(hue))
+            return TonalPalette.FromHueAndChroma(hue, chroma).GetHct(tone);
 
         return HctColor.From(hue, chroma, tone);
     }
diff --git a/MaterialTheming/MaterialDesign/Palettes/RgbColorExtensions.cs b/MaterialTheming/MaterialDesign/Palettes/RgbColorExtensions.cs
@@ -0,0 +1,20 @@
+﻿namespace MaterialTheming.MaterialDesign.Palettes;
+
+internal static class RgbColorExtensions
+{
+    extension(RgbColor)
+    {
+        public static RgbColor AverageColor(RgbColor colorOne, RgbColor colorTwo)
+        {
+            var averageRed = GetAverageComponent(colorOne.Red, colorTwo.Red);
+            var averageGreen = GetAverageComponent(colorOne.Green, colorTwo.Green);
+            var averageBlue = GetAverageComponent(colorOne.Blue, colorTwo.Blue);
+            return RgbColor.FromRgb(averageRed, averageGreen, averageBlue);
+        }
+        private static byte GetAverageComponent(byte componentOne, byte componentTwo)
+        {
+            // MidpointRounding.AwayFromZero - To ensure that .5 always rounds up to the next integer (like in Java)
+            return (byte)Math.Round((componentOne + componentTwo) / 2.0, MidpointRounding.AwayFromZero);
+        }
+    }
+}
diff --git a/MaterialTheming/MaterialDesign/Palettes/TonalPalette.cs b/MaterialTheming/MaterialDesign/Palettes/TonalPalette.cs

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-91da30d89e70c3dc9575ec71a1ebe8874d881f29`
	`1`	`+1a34bd2d696a5dd669beca679546ad72209d0937`