Skip to content

Commit ca102bc

Browse files
committed
#175 - fix build
1 parent 8c6a393 commit ca102bc

File tree

9 files changed

+18
-26
lines changed

9 files changed

+18
-26
lines changed

tests/HydraScript.Infrastructure.LexerRegexGenerator.UnitTests/PatternGeneratorTests.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using Microsoft.CodeAnalysis.CSharp;
55
using NSubstitute;
66
using Xunit;
7-
using Xunit.Abstractions;
87

98
namespace HydraScript.Infrastructure.LexerRegexGenerator.UnitTests;
109

@@ -13,6 +12,7 @@ public class PatternGeneratorTests(ITestOutputHelper output)
1312
[Fact, Trait("Category", "Unit")]
1413
public void Initialize_PatternContainerMarked_CorrectlyGenerated()
1514
{
15+
var ct = TestContext.Current.CancellationToken;
1616
var provider = Substitute.For<ITokenTypesStreamProvider>();
1717
provider.TokenTypesStream.Returns(
1818
[
@@ -25,8 +25,11 @@ public void Initialize_PatternContainerMarked_CorrectlyGenerated()
2525
};
2626
GeneratorDriver driver = CSharpGeneratorDriver.Create(generator);
2727

28-
driver = driver.RunGeneratorsAndUpdateCompilation(CreateCompilation(string.Empty), out var outputCompilation,
29-
out var diagnostics);
28+
driver = driver.RunGeneratorsAndUpdateCompilation(
29+
CreateCompilation(string.Empty),
30+
out var outputCompilation,
31+
out var diagnostics,
32+
ct);
3033
Debug.Assert(diagnostics.IsEmpty);
3134
Debug.Assert(outputCompilation.SyntaxTrees.Count() == 2);
3235

@@ -51,10 +54,10 @@ internal partial class PatternContainer
5154
5255
"""";
5356

54-
output.WriteLine(generatedFileSyntax.GetText().ToString());
57+
output.WriteLine(generatedFileSyntax.GetText(ct).ToString());
5558
Assert.Equal(
5659
expectedSource,
57-
generatedFileSyntax.GetText().ToString(),
60+
generatedFileSyntax.GetText(ct).ToString(),
5861
ignoreLineEndingDifferences: true);
5962
}
6063

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: AssemblyTrait("Category", "Integration")]
1+
[assembly: Trait("Category", "Integration")]

tests/HydraScript.IntegrationTests/Startup.cs

Lines changed: 0 additions & 7 deletions
This file was deleted.

tests/HydraScript.IntegrationTests/TestHostFixture.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@
44
using Microsoft.Extensions.DependencyInjection;
55
using Microsoft.Extensions.Logging;
66
using NSubstitute;
7-
using Xunit.Abstractions;
87

98
namespace HydraScript.IntegrationTests;
109

11-
public class TestHostFixture(
12-
Xunit.DependencyInjection.ITestOutputHelperAccessor accessor) :
13-
IDisposable, ITestOutputHelperAccessor
10+
public class TestHostFixture : IDisposable, ITestOutputHelperAccessor
1411
{
1512
public record Options(
1613
string FileName = ScriptFileName + ".js",
@@ -37,7 +34,7 @@ public void Dispose()
3734

3835
public ITestOutputHelper? OutputHelper
3936
{
40-
get => accessor.Output;
37+
get => TestContext.Current.TestOutputHelper;
4138
set { }
4239
}
4340

tests/HydraScript.UnitTests/AutoHydraScriptDataAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using AutoFixture;
22
using AutoFixture.AutoNSubstitute;
3-
using AutoFixture.Xunit2;
3+
using AutoFixture.Xunit3;
44
using HydraScript.Domain.FrontEnd.Lexer;
55
using HydraScript.Domain.FrontEnd.Lexer.Impl;
66
using HydraScript.Domain.IR;

tests/HydraScript.UnitTests/Domain/BackEnd/VirtualMachineTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using AutoFixture.Xunit2;
1+
using AutoFixture.Xunit3;
22
using HydraScript.Domain.BackEnd;
33
using HydraScript.Domain.BackEnd.Impl;
44
using HydraScript.Domain.BackEnd.Impl.Addresses;

tests/HydraScript.UnitTests/Domain/FrontEnd/LexerData.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace HydraScript.UnitTests.Domain.FrontEnd;
22

3-
public class LexerSuccessData : TheoryData<string>
3+
public sealed class LexerSuccessData : TheoryData<string>
44
{
55
public LexerSuccessData()
66
{
@@ -10,7 +10,7 @@ public LexerSuccessData()
1010
}
1111
}
1212

13-
public class LexerFailData : TheoryData<string>
13+
public sealed class LexerFailData : TheoryData<string>
1414
{
1515
public LexerFailData()
1616
{
@@ -20,7 +20,7 @@ public LexerFailData()
2020
}
2121
}
2222

23-
public class LexerKeywordInsideIdentData : TheoryData<string>
23+
public sealed class LexerKeywordInsideIdentData : TheoryData<string>
2424
{
2525
public LexerKeywordInsideIdentData()
2626
{

tests/HydraScript.UnitTests/Domain/FrontEnd/RegexLexerTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
using System.Text.RegularExpressions;
2-
using AutoFixture.Xunit2;
2+
using AutoFixture.Xunit3;
33
using HydraScript.Domain.FrontEnd.Lexer;
44
using HydraScript.Domain.FrontEnd.Lexer.Impl;
55
using HydraScript.Domain.FrontEnd.Lexer.TokenTypes;
66
using HydraScript.Infrastructure;
7-
using Xunit.Abstractions;
87

98
namespace HydraScript.UnitTests.Domain.FrontEnd;
109

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: AssemblyTrait("Category", "Unit")]
1+
[assembly: Trait("Category", "Unit")]

0 commit comments

Comments
 (0)