Skip to content

Commit 413e8b9

Browse files
fix: failing tests in Linux CI environment (#2175)
* fix: replace AvaloniaFact with Fact in ExpressionEvaluatorUITests * chore: Update nuget packages (UI, tests, ASP .NET Core OpenApi)
1 parent 9aaa384 commit 413e8b9

3 files changed

Lines changed: 42 additions & 44 deletions

File tree

src/Directory.Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageVersion Include="Avalonia" Version="12.0.2" />
8-
<PackageVersion Include="Avalonia.Desktop" Version="12.0.2" />
9-
<PackageVersion Include="Avalonia.Fonts.Inter" Version="12.0.2" />
10-
<PackageVersion Include="Avalonia.Headless" Version="12.0.2" />
7+
<PackageVersion Include="Avalonia" Version="12.0.3" />
8+
<PackageVersion Include="Avalonia.Desktop" Version="12.0.3" />
9+
<PackageVersion Include="Avalonia.Fonts.Inter" Version="12.0.3" />
10+
<PackageVersion Include="Avalonia.Headless" Version="12.0.3" />
1111
<PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.1" />
1212
<PackageVersion Include="AvaloniaGraphControl" Version="0.8.0" />
1313
<PackageVersion Include="AvaloniaHex" Version="0.1.13" />
@@ -32,7 +32,7 @@
3232
<PackageVersion Include="MeltySynth" Version="2.4.1" />
3333
<PackageVersion Include="ModelContextProtocol.AspNetCore" Version="1.3.0" />
3434
<PackageVersion Include="ModelContextProtocol.Core" Version="1.3.0" />
35-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.7" />
35+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.8" />
3636
<PackageVersion Include="Mt32emu.net" Version="1.0.0" />
3737
<PackageVersion Include="NSubstitute" Version="5.3.0" />
3838
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />

tests/Directory.Packages.props

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<Project>
2-
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5-
</PropertyGroup>
6-
<ItemGroup>
7-
<PackageVersion Include="coverlet.collector" Version="10.0.0" />
8-
<PackageVersion Include="ErrorProne.NET.CoreAnalyzers" Version="0.1.2" />
9-
<PackageVersion Include="FluentAssertions" Version="8.9.0" />
10-
<PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
11-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
12-
<PackageVersion Include="NSubstitute" Version="5.3.0" />
13-
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
14-
<PackageVersion Include="Roslynator.Analyzers" Version="4.15.0" />
15-
<PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.15.0" />
16-
<PackageVersion Include="SingleStepTests.Intel80386.00-65" Version="2025.11.5" />
17-
<PackageVersion Include="SingleStepTests.Intel80386.66-66" Version="2025.11.5" />
18-
<PackageVersion Include="SingleStepTests.Intel80386.67.00-67.7F" Version="2025.11.5" />
19-
<PackageVersion Include="SingleStepTests.Intel80386.67.80-67.FF" Version="2025.11.5" />
20-
<PackageVersion Include="SingleStepTests.Intel80386.68-FF" Version="2025.11.5" />
21-
<PackageVersion Include="System.Text.Json" Version="10.0.0" />
22-
<PackageVersion Include="Avalonia.Headless" Version="12.0.2" />
23-
<PackageVersion Include="Avalonia.Headless.XUnit" Version="12.0.2" />
24-
<PackageVersion Include="xunit" Version="2.9.3" />
25-
<PackageVersion Include="xunit.v3" Version="3.2.2" />
26-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
27-
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.61" />
28-
<PackageVersion Include="Tmds.DBus.Protocol" Version="0.92.0" />
29-
</ItemGroup>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<PackageVersion Include="coverlet.collector" Version="10.0.0" />
8+
<PackageVersion Include="ErrorProne.NET.CoreAnalyzers" Version="0.1.2" />
9+
<PackageVersion Include="FluentAssertions" Version="8.10.0" />
10+
<PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
11+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
12+
<PackageVersion Include="NSubstitute" Version="5.3.0" />
13+
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
14+
<PackageVersion Include="Roslynator.Analyzers" Version="4.15.0" />
15+
<PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.15.0" />
16+
<PackageVersion Include="SingleStepTests.Intel80386.00-65" Version="2025.11.5" />
17+
<PackageVersion Include="SingleStepTests.Intel80386.66-66" Version="2025.11.5" />
18+
<PackageVersion Include="SingleStepTests.Intel80386.67.00-67.7F" Version="2025.11.5" />
19+
<PackageVersion Include="SingleStepTests.Intel80386.67.80-67.FF" Version="2025.11.5" />
20+
<PackageVersion Include="SingleStepTests.Intel80386.68-FF" Version="2025.11.5" />
21+
<PackageVersion Include="System.Text.Json" Version="10.0.0" />
22+
<PackageVersion Include="Avalonia.Headless" Version="12.0.3" />
23+
<PackageVersion Include="Avalonia.Headless.XUnit" Version="12.0.3" />
24+
<PackageVersion Include="xunit" Version="2.9.3" />
25+
<PackageVersion Include="xunit.v3" Version="3.2.2" />
26+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
27+
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.61" />
28+
<PackageVersion Include="Tmds.DBus.Protocol" Version="0.92.0" />
29+
</ItemGroup>
3030
</Project>

tests/Spice86.Tests/UI/ExpressionEvaluatorUITests.cs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
namespace Spice86.Tests.UI;
22

3-
using Avalonia.Headless.XUnit;
4-
53
using FluentAssertions;
64

75
using Iced.Intel;
@@ -59,7 +57,7 @@ private static string SegmentsToText(List<FormattedTextToken> segments) =>
5957
/// Verifies that register operands are evaluated for MOV reg, reg.
6058
/// ASM: mov ax, bx (opcode 89 D8)
6159
/// </summary>
62-
[AvaloniaFact]
60+
[Fact]
6361
public void EvaluateOperands_MovAxBx_ShowsBothRegisterValues() {
6462
// Arrange
6563
State state = CreateState();
@@ -95,7 +93,7 @@ public void EvaluateOperands_MovAxBx_ShowsBothRegisterValues() {
9593
/// Verifies that memory operands are evaluated for MOV reg, [mem].
9694
/// ASM: mov ax, [bx] (opcode 8B 07) with DS:BX pointing to 0xABCD.
9795
/// </summary>
98-
[AvaloniaFact]
96+
[Fact]
9997
public void EvaluateOperands_MovAxMemBx_ShowsMemoryValue() {
10098
// Arrange
10199
State state = CreateState();
@@ -134,7 +132,7 @@ public void EvaluateOperands_MovAxMemBx_ShowsMemoryValue() {
134132
/// Verifies that immediates are NOT evaluated (they are already visible in disassembly text).
135133
/// ASM: mov ax, 0x1234 (opcode B8 34 12) - only AX should appear in evaluation.
136134
/// </summary>
137-
[AvaloniaFact]
135+
[Fact]
138136
public void EvaluateOperands_MovAxImm_OnlyShowsDestRegister() {
139137
// Arrange
140138
State state = CreateState();
@@ -165,7 +163,7 @@ public void EvaluateOperands_MovAxImm_OnlyShowsDestRegister() {
165163
/// Verifies that memory with displacement is correctly evaluated.
166164
/// ASM: mov ax, word ptr [bx+0x10] (opcode 8B 47 10)
167165
/// </summary>
168-
[AvaloniaFact]
166+
[Fact]
169167
public void EvaluateOperands_MovAxMemBxDisp_ShowsMemoryValue() {
170168
// Arrange
171169
State state = CreateState();
@@ -203,7 +201,7 @@ public void EvaluateOperands_MovAxMemBxDisp_ShowsMemoryValue() {
203201
/// Verifies that LEA computes the effective address instead of reading memory.
204202
/// ASM: lea ax, [bp-8] (opcode 8D 46 F8) - should show computed address, not memory contents.
205203
/// </summary>
206-
[AvaloniaFact]
204+
[Fact]
207205
public void EvaluateOperands_LeaAxBpMinus8_ShowsEffectiveAddress() {
208206
// Arrange
209207
State state = CreateState();
@@ -244,7 +242,7 @@ public void EvaluateOperands_LeaAxBpMinus8_ShowsEffectiveAddress() {
244242
/// Verifies LEA with base+index computes the effective address.
245243
/// ASM: lea ax, [bx+si] (opcode 8D 00)
246244
/// </summary>
247-
[AvaloniaFact]
245+
[Fact]
248246
public void EvaluateOperands_LeaAxBxSi_ShowsEffectiveAddress() {
249247
// Arrange
250248
State state = CreateState();
@@ -277,7 +275,7 @@ public void EvaluateOperands_LeaAxBxSi_ShowsEffectiveAddress() {
277275
/// Verifies that LDS evaluates the far pointer memory operand (dword containing offset:segment).
278276
/// ASM: lds si, ss:[bp+0x10] (opcode C5 76 10) - should show the dword value at memory.
279277
/// </summary>
280-
[AvaloniaFact]
278+
[Fact]
281279
public void EvaluateOperands_LdsSiBpPlus10_ShowsFarPointerValue() {
282280
// Arrange
283281
State state = CreateState();
@@ -318,7 +316,7 @@ public void EvaluateOperands_LdsSiBpPlus10_ShowsFarPointerValue() {
318316
/// ASM: div word [bp-0xE] (opcode F7 76 F2) with SS=0, BP=0x0100 and divisor 0xE4C3 at SS:BP-0xE.
319317
/// The display label must show BP-0xE, not BP+0xFFF2.
320318
/// </summary>
321-
[AvaloniaFact]
319+
[Fact]
322320
public void EvaluateOperands_DivWordBpMinusE_ShowsNegativeDisplacementAndCorrectValue() {
323321
// Arrange
324322
State state = CreateState();
@@ -359,7 +357,7 @@ public void EvaluateOperands_DivWordBpMinusE_ShowsNegativeDisplacementAndCorrect
359357
/// Verifies that CALL dword ptr [mem] evaluates the far pointer memory operand.
360358
/// ASM: call dword ptr ss:[bp-4] (opcode FF 5E FC) - should show the target address.
361359
/// </summary>
362-
[AvaloniaFact]
360+
[Fact]
363361
public void EvaluateOperands_CallFarPtrBpMinus4_ShowsFarPointerValue() {
364362
// Arrange
365363
State state = CreateState();

0 commit comments

Comments
 (0)