Skip to content

Commit e63d2ee

Browse files
TaritsynTaritsyn
committed
xUnit.net was updated to version 2.3
1 parent 81dcb47 commit e63d2ee

File tree

5 files changed

+50
-26
lines changed

5 files changed

+50
-26
lines changed

‎test/JavaScriptEngineSwitcher.Tests/CommonTestsBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ public virtual void CallingOfFunctionWithManyParametersAndBooleanResultIsCorrect
504504
}
505505

506506
// Assert
507-
Assert.Equal(false, output);
507+
Assert.False(output);
508508
}
509509

510510
[Fact]

‎test/JavaScriptEngineSwitcher.Tests/FileSystemTestsBase.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NETCOREAPP1_0 || NET451
1+
#if NETCOREAPP1_0 || NET452
22
using Microsoft.Extensions.PlatformAbstractions;
33
#elif NET40
44
using System;
@@ -16,15 +16,9 @@ public abstract class FileSystemTestsBase : TestsBase
1616

1717
protected FileSystemTestsBase()
1818
{
19-
#if NETCOREAPP1_0 || NET451
19+
#if NETCOREAPP1_0 || NET452
2020
var appEnv = PlatformServices.Default.Application;
21-
_baseDirectoryPath = Path.Combine(appEnv.ApplicationBasePath,
22-
#if NETCOREAPP1_0
23-
"../../../"
24-
#else
25-
"../../../../"
26-
#endif
27-
);
21+
_baseDirectoryPath = Path.Combine(appEnv.ApplicationBasePath, "../../../");
2822
#elif NET40
2923
_baseDirectoryPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "../../");
3024
#else

‎test/JavaScriptEngineSwitcher.Tests/InteropTestsBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ public virtual void EmbeddingOfInstanceOfBuiltinReferenceTypeWithMethodIsCorrect
298298
}
299299

300300
// Assert
301-
Assert.True(targetOutput.Contains(output));
301+
Assert.Contains(output, targetOutput);
302302
}
303303

304304
[Fact]
@@ -761,7 +761,7 @@ public virtual void EmbeddingOfBuiltinReferenceTypeWithPropertyIsCorrect()
761761
}
762762

763763
// Assert
764-
Assert.True(targetOutput.Contains(output));
764+
Assert.Contains(output, targetOutput);
765765
}
766766

767767
[Fact]

‎test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj

Lines changed: 44 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<VersionPrefix>3.0.0</VersionPrefix>
55
<VersionSuffix>alpha5</VersionSuffix>
6-
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
6+
<TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
77
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
88
<OutputType>Library</OutputType>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -20,14 +20,9 @@
2020

2121
<ItemGroup>
2222
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.0.0" />
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
24-
<PackageReference Include="xunit" Version="2.2.0" />
25-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
26-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.debian-x64" Version="3.0.0-alpha3" />
27-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" Version="3.0.0-alpha3" />
28-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm" Version="3.0.0-alpha3" />
29-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" Version="3.0.0-alpha3" />
30-
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" Version="3.0.0-alpha3" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
24+
<PackageReference Include="xunit" Version="2.3.0" />
25+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
3126

3227
<ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.ChakraCore\JavaScriptEngineSwitcher.ChakraCore.csproj" />
3328
<ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.Core\JavaScriptEngineSwitcher.Core.csproj" />
@@ -37,20 +32,56 @@
3732
</ItemGroup>
3833

3934
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
35+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.debian-x64" Version="3.0.0-alpha3" />
36+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" Version="3.0.0-alpha3" />
37+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm" Version="3.0.0-alpha3" />
38+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" Version="3.0.0-alpha3" />
39+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" Version="3.0.0-alpha3" />
4040
</ItemGroup>
4141

42-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
42+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
4343
<Reference Include="System.Drawing" />
4444

45-
<PackageReference Include="JavaScriptEngineSwitcher.V8.Native.win-x64" Version="3.0.0-alpha5" />
46-
<PackageReference Include="JavaScriptEngineSwitcher.V8.Native.win-x86" Version="3.0.0-alpha5" />
47-
4845
<ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.Jurassic\JavaScriptEngineSwitcher.Jurassic.csproj" />
4946
<ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.V8\JavaScriptEngineSwitcher.V8.csproj" />
47+
48+
<None Include="..\..\lib\ChakraCore\win-x86\ChakraCore.dll">
49+
<Link>x86\ChakraCore.dll</Link>
50+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
51+
</None>
52+
<None Include="..\..\lib\ChakraCore\win-x64\ChakraCore.dll">
53+
<Link>x64\ChakraCore.dll</Link>
54+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
55+
</None>
56+
<None Include="..\..\lib\ChakraCore\win8-arm\ChakraCore.dll">
57+
<Link>arm\ChakraCore.dll</Link>
58+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
59+
</None>
60+
61+
<None Include="..\..\lib\ClearScript\win-x86\ClearScriptV8-32.dll">
62+
<Link>x86\ClearScriptV8-32.dll</Link>
63+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
64+
</None>
65+
<None Include="..\..\lib\ClearScript\win-x86\v8-ia32.dll">
66+
<Link>x86\v8-ia32.dll</Link>
67+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
68+
</None>
69+
<None Include="..\..\lib\ClearScript\win-x64\ClearScriptV8-64.dll">
70+
<Link>x64\ClearScriptV8-64.dll</Link>
71+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
72+
</None>
73+
<None Include="..\..\lib\ClearScript\win-x64\v8-x64.dll">
74+
<Link>x64\v8-x64.dll</Link>
75+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
76+
</None>
5077
</ItemGroup>
5178

5279
<ItemGroup>
5380
<EmbeddedResource Include="Resources\cube.js;Resources\power.js" />
5481
</ItemGroup>
5582

83+
<ItemGroup>
84+
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
85+
</ItemGroup>
86+
5687
</Project>

‎test/JavaScriptEngineSwitcher.Tests/Jurassic/CommonTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ protected override string EngineName
1515

1616
#region Mapping errors
1717

18-
[Fact]
1918
public override void MappingRuntimeErrorDuringEvaluationOfExpressionIsCorrect()
2019
{
2120
// Arrange

0 commit comments

Comments
 (0)