Skip to content

Commit fc4da2b

Browse files
tomvanenckevorttomvanenckevort
committed
Upgraded to Jint v3
1 parent 1a9cd80 commit fc4da2b

29 files changed

+393
-497
lines changed

‎src/AngleSharp.Js.Tests/ComponentTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace AngleSharp.Js.Tests
22
{
33
using AngleSharp.Scripting;
4-
using AngleSharp.Xml;
4+
using Jint;
55
using NUnit.Framework;
66
using System;
77
using System.Threading.Tasks;

‎src/AngleSharp.Js.Tests/Constants.cs

Lines changed: 156 additions & 0 deletions
Large diffs are not rendered by default.

‎src/AngleSharp.Js.Tests/EcmaTests.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
namespace AngleSharp.Js.Tests
2+
{
3+
using NUnit.Framework;
4+
using System;
5+
using System.Threading.Tasks;
6+
7+
[TestFixture]
8+
public class EcmaTests
9+
{
10+
private static String SetResult(String eval) =>
11+
$"document.querySelector('#result').textContent = {eval};";
12+
13+
[Test]
14+
public async Task BootstrapVersionFive()
15+
{
16+
var result = await (new[] { Constants.Bootstrap_5_3_3, SetResult("bootstrap.toString()") }).EvalScriptsAsync()
17+
.ConfigureAwait(false);
18+
Assert.AreNotEqual("", result);
19+
}
20+
}
21+
}

‎src/AngleSharp.Js.Tests/FireEventTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ namespace AngleSharp.Js.Tests
33
using AngleSharp.Dom;
44
using AngleSharp.Dom.Events;
55
using AngleSharp.Scripting;
6+
using Jint;
67
using NUnit.Framework;
78

89
using System;
@@ -60,11 +61,11 @@ public async Task InvokeLoadEventFromJsAndCustomEventFromJsAndCs()
6061

6162
document.AddEventListener("hello", (s, ev) =>
6263
{
63-
log.Put(log.Get("length").AsNumber().ToString(), "d", false);
64+
log.Set(log.Get("length").AsNumber(), "d", false);
6465
});
6566

6667
document.Dispatch(new Event("hello"));
67-
68+
6869
Assert.AreEqual(4.0, log.Get("length").AsNumber());
6970
Assert.AreEqual("a", log.Get("0").AsString());
7071
Assert.AreEqual("b", log.Get("1").AsString());

‎src/AngleSharp.Js.Tests/InteractionTests.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ namespace AngleSharp.Js.Tests
33
using AngleSharp.Dom;
44
using AngleSharp.Html.Dom;
55
using AngleSharp.Scripting;
6+
using Jint;
67
using Jint.Runtime;
78
using NUnit.Framework;
89
using System;
@@ -30,8 +31,9 @@ public async Task RunJavaScriptFunctionFromCSharp()
3031
var cfg = Configuration.Default.With(service);
3132
var html = "<!doctype html><script>function square(x) { return x * x; }</script>";
3233
var document = await BrowsingContext.New(cfg).OpenAsync(m => m.Content(html));
33-
var square = service.GetOrCreateJint(document).GetValue("square");
34-
var result = square.Invoke(4);
34+
var engine = service.GetOrCreateJint(document);
35+
var square = engine.GetValue("square");
36+
var result = engine.Invoke(square, 4);
3537
Assert.AreEqual(Types.Number, result.Type);
3638
Assert.AreEqual(16.0, result.AsNumber());
3739
}

‎src/AngleSharp.Js.Tests/JqueryTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public async Task JqueryWithAjaxToDelayedResponse()
6666
var message = "Hi!";
6767
var req = new DelayedRequester(10, message);
6868
var cfg = Configuration.Default.WithJs().WithEventLoop().With(req).WithDefaultLoader();
69-
var sources = new [] { Constants.Jquery2_1_4, @"
69+
var sources = new[] { Constants.Jquery2_1_4, @"
7070
$.ajax('http://example.com/', {
7171
success: function (data, status, xhr) {
7272
var res = document.querySelector('#result');
@@ -87,7 +87,7 @@ public async Task JqueryWithAjaxToDelayedResponse()
8787
[Test]
8888
public async Task JqueryVersionOne()
8989
{
90-
var result = await (new [] { Constants.Jquery1_11_2, SetResult("$.toString()") }).EvalScriptsAsync()
90+
var result = await (new[] { Constants.Jquery1_11_2, SetResult("$.toString()") }).EvalScriptsAsync()
9191
.ConfigureAwait(false);
9292
Assert.AreNotEqual("", result);
9393
}

‎src/AngleSharp.Js.Tests/Mocks/DataRequester.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
sealed class DataRequester : BaseRequester
1212
{
1313
private static readonly String Base64Section = ";base64";
14-
14+
1515
public override Boolean SupportsProtocol(String protocol)
1616
{
1717
return protocol.Is(ProtocolNames.Data);
1818
}
19-
19+
2020
protected override Task<IResponse> PerformRequestAsync(Request request, CancellationToken cancel)
2121
{
2222
var content = new MemoryStream();

‎src/AngleSharp.Js/AngleSharp.Js.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<AssemblyName>AngleSharp.Js</AssemblyName>
44
<RootNamespace>AngleSharp.Js</RootNamespace>
55
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0</TargetFrameworks>
6-
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;net46;net461;net472</TargetFrameworks>
6+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;net462</TargetFrameworks>
77
<SignAssembly>true</SignAssembly>
88
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -22,7 +22,7 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="AngleSharp" Version="0.15.0" />
25-
<PackageReference Include="Jint" Version="2.10.4" />
25+
<PackageReference Include="Jint" Version="3.0.0" />
2626
</ItemGroup>
2727

2828
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">

‎src/AngleSharp.Js/Cache/PrototypeCache.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public PrototypeCache(Engine engine)
1414
{
1515
_prototypes = new ConcurrentDictionary<Type, ObjectInstance>
1616
{
17-
[typeof(Object)] = engine.Object.PrototypeObject,
17+
[typeof(Object)] = engine.Intrinsics.Object.PrototypeObject,
1818
};
1919
_engine = engine;
2020
}

‎src/AngleSharp.Js/Converters/DomTypeConverter.cs

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

0 commit comments

Comments
 (0)