Skip to content

Commit f420208

Browse files
TaritsynTaritsyn
committed
In test projects was made refactoring
1 parent 82ec999 commit f420208

45 files changed

Lines changed: 103 additions & 250 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎test/JavaScriptEngineSwitcher.Benchmarks/HostObjectsEmbeddingBenchmark.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
#if NET461 || NETCOREAPP3_1_OR_GREATER
1413
using JavaScriptEngineSwitcher.NiL;
1514
using JavaScriptEngineSwitcher.V8;
16-
#endif
1715

1816
using JavaScriptEngineSwitcher.Benchmarks.Interop.ObjectsEmbedding;
1917

@@ -120,7 +118,7 @@ public void Jurassic()
120118
Func<IJsEngine> createJsEngine = () => new JurassicJsEngine();
121119
EmbedAndUseHostObjects(createJsEngine);
122120
}
123-
#if NET461
121+
#if NET462
124122

125123
[Benchmark]
126124
public void MsieClassic()
@@ -161,7 +159,6 @@ public void MsieChakraEdgeJsRt()
161159
});
162160
EmbedAndUseHostObjects(createJsEngine);
163161
}
164-
#if NET461 || NETCOREAPP3_1_OR_GREATER
165162

166163
[Benchmark]
167164
public void NiL()
@@ -180,6 +177,5 @@ public void V8(bool disableDynamicBinding)
180177
);
181178
EmbedAndUseHostObjects(createJsEngine);
182179
}
183-
#endif
184180
}
185181
}

‎test/JavaScriptEngineSwitcher.Benchmarks/HostTypesEmbeddingBenchmark.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
#if NET461 || NETCOREAPP3_1_OR_GREATER
1413
using JavaScriptEngineSwitcher.NiL;
1514
using JavaScriptEngineSwitcher.V8;
16-
#endif
1715

1816
using JavaScriptEngineSwitcher.Benchmarks.Interop.TypesEmbedding;
1917

@@ -100,7 +98,7 @@ public void Jurassic()
10098
Func<IJsEngine> createJsEngine = () => new JurassicJsEngine();
10199
EmbedAndUseHostTypes(createJsEngine);
102100
}
103-
#if NET461
101+
#if NET462
104102

105103
[Benchmark]
106104
public void MsieClassic()
@@ -141,7 +139,6 @@ public void MsieChakraEdgeJsRt()
141139
});
142140
EmbedAndUseHostTypes(createJsEngine);
143141
}
144-
#if NET461 || NETCOREAPP3_1_OR_GREATER
145142

146143
[Benchmark]
147144
public void NiL()
@@ -160,6 +157,5 @@ public void V8(bool disableDynamicBinding)
160157
);
161158
EmbedAndUseHostTypes(createJsEngine);
162159
}
163-
#endif
164160
}
165161
}

‎test/JavaScriptEngineSwitcher.Benchmarks/JavaScriptEngineSwitcher.Benchmarks.csproj‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Product>JS Engine Switcher: Benchmarks</Product>
55
<VersionPrefix>3.23.4</VersionPrefix>
6-
<TargetFrameworks>net461;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
77
<OutputType>Exe</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
@@ -15,6 +15,7 @@
1515
<Import Project="../../build/common.props" />
1616

1717
<ItemGroup>
18+
<PackageReference Include="BenchmarkDotNet" VersionOverride="0.13.11" />
1819
<PackageReference Include="BuildBundlerMinifier" VersionOverride="3.2.449" PrivateAssets="All" />
1920
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-arm" />
2021
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-arm64" />
@@ -36,15 +37,7 @@
3637
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Yantra/JavaScriptEngineSwitcher.Yantra.csproj" />
3738
</ItemGroup>
3839

39-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
40-
<PackageReference Include="BenchmarkDotNet" VersionOverride="0.13.3" />
41-
</ItemGroup>
42-
43-
<ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
44-
<PackageReference Include="BenchmarkDotNet" VersionOverride="0.13.10" />
45-
</ItemGroup>
46-
47-
<ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
40+
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
4841
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" />
4942
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" />
5043
<PackageReference Include="Microsoft.ClearScript.V8.Native.linux-arm" />

‎test/JavaScriptEngineSwitcher.Benchmarks/JsExecutionHeavyBenchmark.cs‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,11 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
#if NET461 || NETCOREAPP3_1_OR_GREATER
1413
using JavaScriptEngineSwitcher.NiL;
15-
#endif
1614
using JavaScriptEngineSwitcher.Node;
17-
#if NET461 || NETCOREAPP3_1_OR_GREATER
1815
using JavaScriptEngineSwitcher.V8;
19-
#endif
2016
using JavaScriptEngineSwitcher.Vroom;
21-
#if NET461 || NETCOREAPP3_1_OR_GREATER
2217
using JavaScriptEngineSwitcher.Yantra;
23-
#endif
2418

2519
namespace JavaScriptEngineSwitcher.Benchmarks
2620
{
@@ -182,7 +176,7 @@ public void Jurassic(bool withPrecompilation)
182176
Func<IJsEngine> createJsEngine = () => new JurassicJsEngine();
183177
RenderTemplates(createJsEngine, withPrecompilation);
184178
}
185-
#if NET461
179+
#if NET462
186180

187181
[Benchmark]
188182
public void MsieClassic()
@@ -228,23 +222,20 @@ public void MsieChakraEdgeJsRt(bool withPrecompilation)
228222
});
229223
RenderTemplates(createJsEngine, withPrecompilation);
230224
}
231-
#if NET461 || NETCOREAPP3_1_OR_GREATER
232225

233226
[Benchmark]
234227
public void NiL()
235228
{
236229
Func<IJsEngine> createJsEngine = () => new NiLJsEngine();
237230
RenderTemplates(createJsEngine, false);
238231
}
239-
#endif
240232

241233
[Benchmark]
242234
public void Node()
243235
{
244236
Func<IJsEngine> createJsEngine = () => new NodeJsEngine();
245237
RenderTemplates(createJsEngine, false);
246238
}
247-
#if NET461 || NETCOREAPP3_1_OR_GREATER
248239

249240
[Benchmark]
250241
[Arguments(false)]
@@ -254,23 +245,20 @@ public void V8(bool withPrecompilation)
254245
Func<IJsEngine> createJsEngine = () => new V8JsEngine();
255246
RenderTemplates(createJsEngine, withPrecompilation);
256247
}
257-
#endif
258248

259249
[Benchmark]
260250
public void Vroom()
261251
{
262252
Func<IJsEngine> createJsEngine = () => new VroomJsEngine();
263253
RenderTemplates(createJsEngine, false);
264254
}
265-
#if NET461 || NETCOREAPP3_1_OR_GREATER
266255

267256
[Benchmark]
268257
public void Yantra()
269258
{
270259
Func<IJsEngine> createJsEngine = () => new YantraJsEngine();
271260
RenderTemplates(createJsEngine, false);
272261
}
273-
#endif
274262

275263
#region Internal types
276264

‎test/JavaScriptEngineSwitcher.Benchmarks/JsExecutionLightBenchmark.cs‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,11 @@
1010
using JavaScriptEngineSwitcher.Jint;
1111
using JavaScriptEngineSwitcher.Jurassic;
1212
using JavaScriptEngineSwitcher.Msie;
13-
#if NET461 || NETCOREAPP3_1_OR_GREATER
1413
using JavaScriptEngineSwitcher.NiL;
15-
#endif
1614
using JavaScriptEngineSwitcher.Node;
17-
#if NET461 || NETCOREAPP3_1_OR_GREATER
1815
using JavaScriptEngineSwitcher.V8;
19-
#endif
2016
using JavaScriptEngineSwitcher.Vroom;
21-
#if NET461 || NETCOREAPP3_1_OR_GREATER
2217
using JavaScriptEngineSwitcher.Yantra;
23-
#endif
2418

2519
namespace JavaScriptEngineSwitcher.Benchmarks
2620
{
@@ -217,7 +211,7 @@ public void Jurassic(bool withPrecompilation)
217211
Func<IJsEngine> createJsEngine = () => new JurassicJsEngine();
218212
TransliterateStrings(createJsEngine, withPrecompilation);
219213
}
220-
#if NET461
214+
#if NET462
221215

222216
[Benchmark]
223217
public void MsieClassic()
@@ -262,23 +256,20 @@ public void MsieChakraEdgeJsRt(bool withPrecompilation)
262256
});
263257
TransliterateStrings(createJsEngine, withPrecompilation);
264258
}
265-
#if NET461 || NETCOREAPP3_1_OR_GREATER
266259

267260
[Benchmark]
268261
public void NiL()
269262
{
270263
Func<IJsEngine> createJsEngine = () => new NiLJsEngine();
271264
TransliterateStrings(createJsEngine, false);
272265
}
273-
#endif
274266

275267
[Benchmark]
276268
public void Node()
277269
{
278270
Func<IJsEngine> createJsEngine = () => new NodeJsEngine();
279271
TransliterateStrings(createJsEngine, false);
280272
}
281-
#if NET461 || NETCOREAPP3_1_OR_GREATER
282273

283274
[Benchmark]
284275
[Arguments(false)]
@@ -288,22 +279,19 @@ public void V8(bool withPrecompilation)
288279
Func<IJsEngine> createJsEngine = () => new V8JsEngine();
289280
TransliterateStrings(createJsEngine, withPrecompilation);
290281
}
291-
#endif
292282

293283
[Benchmark]
294284
public void Vroom()
295285
{
296286
Func<IJsEngine> createJsEngine = () => new VroomJsEngine();
297287
TransliterateStrings(createJsEngine, false);
298288
}
299-
#if NET461 || NETCOREAPP3_1_OR_GREATER
300289

301290
[Benchmark]
302291
public void Yantra()
303292
{
304293
Func<IJsEngine> createJsEngine = () => new YantraJsEngine();
305294
TransliterateStrings(createJsEngine, false);
306295
}
307-
#endif
308296
}
309297
}

‎test/JavaScriptEngineSwitcher.Tests/Interop/LoginFailedException.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using System;
2+
#if !NET8_0_OR_GREATER
23
using System.Runtime.Serialization;
4+
#endif
35

46
namespace JavaScriptEngineSwitcher.Tests.Interop
57
{

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

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,45 @@
33
<PropertyGroup>
44
<Product>JS Engine Switcher: Tests</Product>
55
<VersionPrefix>3.23.4</VersionPrefix>
6-
<TargetFrameworks>net452;net471;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net462;net471;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<LangVersion>latest</LangVersion>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10-
<NoWarn>$(NoWarn);NU1902;NU1903</NoWarn>
1110
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
1211
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
12+
<IsTestProject>true</IsTestProject>
1313
<IsPackable>false</IsPackable>
14-
<CheckEolTargetFramework>false</CheckEolTargetFramework>
1514
</PropertyGroup>
1615

1716
<Import Project="../../build/common.props" />
1817

1918
<ItemGroup>
19+
<PackageReference Include="xunit" VersionOverride="2.6.2" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" VersionOverride="17.8.0" />
2021
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-arm" />
2122
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-arm64" />
2223
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" />
2324
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" />
25+
<PackageReference Include="Microsoft.ClearScript.V8.Native.win-arm64" />
26+
<PackageReference Include="Microsoft.ClearScript.V8.Native.win-x64" />
27+
<PackageReference Include="Microsoft.ClearScript.V8.Native.win-x86" />
2428

2529
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj" />
2630
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
31+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
2732
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj" />
2833
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj" />
34+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
35+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
36+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj" />
2937
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
38+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Yantra/JavaScriptEngineSwitcher.Yantra.csproj" />
3039
</ItemGroup>
3140

32-
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net471' ">
41+
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net471' ">
3342
<Reference Include="System.Drawing" />
3443
</ItemGroup>
3544

36-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
37-
<PackageReference Include="System.Text.Encoding.CodePages" VersionOverride="4.5.1" />
38-
</ItemGroup>
39-
4045
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
4146
<PackageReference Include="System.Text.Encoding.CodePages" VersionOverride="4.7.1" />
4247
</ItemGroup>
@@ -57,49 +62,24 @@
5762
<PackageReference Include="System.Text.Encoding.CodePages" VersionOverride="8.0.0" />
5863
</ItemGroup>
5964

60-
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'netcoreapp2.1' ">
61-
<PackageReference Include="Microsoft.NET.Test.Sdk" VersionOverride="17.3.2" />
62-
<PackageReference Include="xunit" VersionOverride="2.4.2" />
63-
<PackageReference Include="xunit.runner.visualstudio" VersionOverride="2.4.3" />
65+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' ">
66+
<PackageReference Include="xunit.runner.visualstudio" VersionOverride="2.4.5" />
6467
</ItemGroup>
6568

66-
<ItemGroup Condition=" '$(TargetFramework)' != 'net452' And '$(TargetFramework)' != 'netcoreapp2.1' ">
67-
<PackageReference Include="Microsoft.NET.Test.Sdk" VersionOverride="17.8.0" />
68-
<PackageReference Include="xunit" VersionOverride="2.6.2" />
69-
<PackageReference Include="xunit.runner.visualstudio" VersionOverride="2.4.5" />
69+
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' ">
70+
<PackageReference Include="xunit.runner.visualstudio" VersionOverride="2.5.4" />
7071
</ItemGroup>
7172

72-
<ItemGroup Condition=" '$(TargetFramework)' != 'net452' And '$(TargetFramework)' != 'net471' ">
73+
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' And '$(TargetFramework)' != 'net471' ">
7374
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" />
7475
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" />
75-
</ItemGroup>
76-
77-
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.1' ">
78-
<PackageReference Include="Microsoft.ClearScript.V8.Native.win-arm64" />
79-
<PackageReference Include="Microsoft.ClearScript.V8.Native.win-x64" />
80-
<PackageReference Include="Microsoft.ClearScript.V8.Native.win-x86" />
81-
82-
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj" />
83-
</ItemGroup>
84-
85-
<ItemGroup Condition=" '$(TargetFramework)' != 'net452' And '$(TargetFramework)' != 'net471' And '$(TargetFramework)' != 'netcoreapp2.1' ">
8676
<PackageReference Include="Microsoft.ClearScript.V8.Native.linux-arm" />
8777
<PackageReference Include="Microsoft.ClearScript.V8.Native.linux-arm64" />
8878
<PackageReference Include="Microsoft.ClearScript.V8.Native.linux-x64" />
8979
<PackageReference Include="Microsoft.ClearScript.V8.Native.osx-arm64" />
9080
<PackageReference Include="Microsoft.ClearScript.V8.Native.osx-x64" />
9181
</ItemGroup>
9282

93-
<ItemGroup Condition=" '$(TargetFramework)' != 'net452' ">
94-
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
95-
</ItemGroup>
96-
97-
<ItemGroup Condition=" '$(TargetFramework)' != 'net452' And '$(TargetFramework)' != 'netcoreapp2.1' ">
98-
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
99-
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
100-
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Yantra/JavaScriptEngineSwitcher.Yantra.csproj" />
101-
</ItemGroup>
102-
10383
<ItemGroup>
10484
<EmbeddedResource Include="Resources/*.js" />
10585
</ItemGroup>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if !NET452
2-
using System;
1+
using System;
32

43
using Xunit;
54

@@ -569,5 +568,4 @@ public void GenerationOfRuntimeErrorMessage()
569568

570569
#endregion
571570
}
572-
}
573-
#endif
571+
}

0 commit comments

Comments
 (0)