Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<PackageVersion Include="Spectre.Console.Cli" Version="0.45.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.6" />
<PackageVersion Include="Test262Harness" Version="1.0.2" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.v3" Version="3.0.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" PrivateAssets="all" />
<PackageVersion Include="YantraJS.Core" Version="1.2.286" />
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion Jint.Tests.PublicInterface/Jint.Tests.PublicInterface.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<IsPackable>false</IsPackable>
<NoWarn>612</NoWarn>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<OutputType>Exe</OutputType>
</PropertyGroup>


Expand All @@ -24,7 +25,7 @@
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
<PackageReference Include="SourceMaps" />
<PackageReference Include="System.Text.Json" Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net8.0'))" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.v3" />
<PackageReference Include="xunit.runner.visualstudio" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion Jint.Tests/Jint.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<SignAssembly>true</SignAssembly>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);612</NoWarn>
<OutputType>Exe</OutputType>
</PropertyGroup>

<ItemGroup>
Expand All @@ -26,7 +27,7 @@
<PackageReference Include="MongoDB.Bson.signed" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)' == 'net472'" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.v3" />
<PackageReference Include="xunit.runner.visualstudio" />
</ItemGroup>

Expand Down
16 changes: 8 additions & 8 deletions Jint.Tests/ReplaceCulture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System.Globalization;
using System.Reflection;
using Xunit.Sdk;
using Xunit.v3;

namespace Jint.Tests;

Expand Down Expand Up @@ -64,7 +64,7 @@ public ReplaceCultureAttribute(string currentCulture, string currentUICulture)
#endif
public CultureInfo UICulture { get; }

public override void Before(MethodInfo methodUnderTest)
public override void Before(MethodInfo methodUnderTest, IXunitTest test)
{
_originalCulture = CultureInfo.CurrentCulture;
_originalUICulture = CultureInfo.CurrentUICulture;
Expand All @@ -73,20 +73,20 @@ public override void Before(MethodInfo methodUnderTest)
System.Threading.Thread.CurrentThread.CurrentCulture = Culture;
System.Threading.Thread.CurrentThread.CurrentUICulture = UICulture;
#else
CultureInfo.CurrentCulture = Culture;
CultureInfo.CurrentUICulture = UICulture;
CultureInfo.CurrentCulture = Culture;
CultureInfo.CurrentUICulture = UICulture;
#endif

}

public override void After(MethodInfo methodUnderTest)
public override void After(MethodInfo methodUnderTest, IXunitTest test)
{
#if NETFRAMEWORK
System.Threading.Thread.CurrentThread.CurrentCulture = _originalCulture;
System.Threading.Thread.CurrentThread.CurrentUICulture = _originalUICulture;
#else
CultureInfo.CurrentCulture = _originalCulture;
CultureInfo.CurrentUICulture = _originalUICulture;
CultureInfo.CurrentCulture = _originalCulture;
CultureInfo.CurrentUICulture = _originalUICulture;
#endif
}
}
}
7 changes: 5 additions & 2 deletions Jint.Tests/RunnableInDebugOnlyAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
using System.Diagnostics;
using System.Runtime.CompilerServices;

namespace Jint.Tests;

public class RunnableInDebugOnlyAttribute : FactAttribute
{
public RunnableInDebugOnlyAttribute()
public RunnableInDebugOnlyAttribute(
[CallerFilePath] string sourceFilePath = null,
[CallerLineNumber] int sourceLineNumber = -1) : base(sourceFilePath, sourceLineNumber)
{
if (!Debugger.IsAttached)
{
Skip = "Only running in interactive mode.";
}
}
}
}
2 changes: 1 addition & 1 deletion Jint.Tests/Runtime/AsyncTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ async function run(i) {
}

await Task.WhenAll(tasks.Select(t => t.Task));
await Task.Delay(100);
await Task.Delay(100, TestContext.Current.CancellationToken);
}
}

Expand Down
1 change: 0 additions & 1 deletion Jint.Tests/Runtime/EngineTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Jint.Runtime;
using Jint.Runtime.Debugger;
using Jint.Tests.Runtime.Debugger;
using Xunit.Abstractions;

#pragma warning disable 618

Expand Down
5 changes: 2 additions & 3 deletions Jint.Tests/Runtime/TypeConverterTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Jint.Native;
using Jint.Runtime;
using Xunit.Abstractions;

namespace Jint.Tests.Runtime;

Expand All @@ -17,7 +16,7 @@ public TypeConverterTests(ITestOutputHelper output)
;
}

public static readonly IEnumerable<object[]> ConvertNumberToInt32AndUint32TestData = new TheoryData<double, int>()
public static readonly TheoryData<double, int> ConvertNumberToInt32AndUint32TestData = new()
{
{ 0.0, 0 },
{ -0.0, 0 },
Expand Down Expand Up @@ -91,4 +90,4 @@ public void ToPrimitiveShouldEvaluateOnlyOnceDuringInExpression()
equal(1, bval);
");
}
}
}
2 changes: 1 addition & 1 deletion Jint.Tests/Runtime/WeakSetMapTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public void WeakSetShouldThrowWhenCalledWithoutNew()
Assert.Equal("Constructor WeakSet requires 'new'", e.Message);
}

public static IEnumerable<object[]> PrimitiveKeys = new TheoryData<JsValue>
public static TheoryData<JsValue> PrimitiveKeys = new()
{
JsValue.Null,
JsValue.Undefined,
Expand Down