Updated to AngleSharp v0.9.6

FlorianRappl · FlorianRappl · commit e795421672a9 · 2016-05-06T08:10:58.000+02:00
diff --git a/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj b/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj
@@ -35,8 +35,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.4.42449, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.4\lib\net45\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.6.41832, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.6\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
@@ -48,8 +48,8 @@
       <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
diff --git a/AngleSharp.Scripting.CSharp.Tests/ConversionTests.cs b/AngleSharp.Scripting.CSharp.Tests/ConversionTests.cs
@@ -8,12 +8,14 @@
     public class ConversionTests
     {
         [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
         public void ConvertCurrentDocumentOfFreshBrowsingContextWithoutDocumentShouldThrowException()
         {
             var context = BrowsingContext.New();
-            var document = context.GetDynamicDocument();
-            Assert.IsNotNull(document);
+            Assert.Catch<ArgumentNullException>(() =>
+            {
+                var document = context.GetDynamicDocument();
+                Assert.IsNotNull(document);
+            });
         }
 
         [Test]
diff --git a/AngleSharp.Scripting.CSharp.Tests/packages.config b/AngleSharp.Scripting.CSharp.Tests/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.4" targetFramework="net45" />
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="AngleSharp" version="0.9.6" targetFramework="net45" />
+  <package id="NUnit" version="3.2.1" targetFramework="net45" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
 </packages>
diff --git a/AngleSharp.Scripting.CSharp/AngleSharp.Scripting.CSharp.csproj b/AngleSharp.Scripting.CSharp/AngleSharp.Scripting.CSharp.csproj
@@ -43,8 +43,8 @@
     <Compile Include="WindowService.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.4.42449, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.4\lib\portable-windows8+net45+windowsphone8+wpa\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.6.41832, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.6\lib\portable-windows8+net45+windowsphone8+wpa\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/AngleSharp.Scripting.CSharp/WindowContext.cs b/AngleSharp.Scripting.CSharp/WindowContext.cs
@@ -156,6 +156,11 @@ public void RemoveEventListener(String type, DomEventHandler callback = null, Bo
             _window.RemoveEventListener(type, callback, capture);
         }
 
+        public void InvokeEventListener(Event ev)
+        {
+            _window.InvokeEventListener(ev);
+        }
+
         public void ClearInterval(Int32 handle = 0)
         {
             _window.ClearInterval(handle);
diff --git a/AngleSharp.Scripting.CSharp/packages.config b/AngleSharp.Scripting.CSharp/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.4" targetFramework="portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
+  <package id="AngleSharp" version="0.9.6" targetFramework="portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
 </packages>
diff --git a/AngleSharp.Scripting.JavaScript.Generator/AngleSharp.Scripting.JavaScript.Generator.csproj b/AngleSharp.Scripting.JavaScript.Generator/AngleSharp.Scripting.JavaScript.Generator.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.4.42449, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.4\lib\net45\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.6.41832, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.6\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/AngleSharp.Scripting.JavaScript.Generator/packages.config b/AngleSharp.Scripting.JavaScript.Generator/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.4" targetFramework="net46" />
+  <package id="AngleSharp" version="0.9.6" targetFramework="net46" />
 </packages>
diff --git a/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj b/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj
@@ -36,12 +36,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.4.42449, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.4\lib\net45\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.6.41832, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.6\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Jint, Version=2.6.0.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
-      <HintPath>..\packages\Jint.2.7.1\lib\portable-net40+sl50+win+WindowsPhoneApp81+wp80\Jint.dll</HintPath>
+    <Reference Include="Jint, Version=2.7.1.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
+      <HintPath>..\packages\Jint.2.8\lib\portable-net40+sl50+win+WindowsPhoneApp81+wp80\Jint.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@@ -54,9 +54,9 @@
       <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/AngleSharp.Scripting.JavaScript.Tests/JqueryTests.cs b/AngleSharp.Scripting.JavaScript.Tests/JqueryTests.cs
@@ -86,7 +86,7 @@ public async Task JqueryWithAjaxToDelayedResponse()
             var result = document.QuerySelector("#result");
             Assert.AreEqual("", result.TextContent);
             Assert.IsTrue(req.IsStarted);
-            await result.AwaitEvent("xhrdone").ConfigureAwait(false);
+            await result.AwaitEventAsync("xhrdone").ConfigureAwait(false);
             Assert.AreEqual(message, result.TextContent);
         }
 
diff --git a/AngleSharp.Scripting.JavaScript.Tests/ScriptEvalTests.cs b/AngleSharp.Scripting.JavaScript.Tests/ScriptEvalTests.cs
@@ -121,14 +121,16 @@ public async Task PerformXmlHttpRequestAsynchronousToDelayedResponseShouldWork()
             var result = document.QuerySelector("#result");
             Assert.AreEqual("", result.TextContent);
             Assert.IsTrue(req.IsStarted);
-            await result.AwaitEvent("xhrdone").ConfigureAwait(false);
+            await result.AwaitEventAsync("xhrdone").ConfigureAwait(false);
             Assert.AreEqual(message, result.TextContent);
         }
 
         [Test]
         public async Task SetContentOfIFrameElement()
         {
-            var cfg = Configuration.Default.WithJavaScript();
+            var cfg = Configuration.Default.
+                WithDefaultLoader(setup => setup.IsResourceLoadingEnabled = true).
+                WithJavaScript();
             var html = @"<!doctype html><iframe id=myframe srcdoc=''></iframe><script>
 var iframe = document.querySelector('#myframe');
 var doc = iframe.contentWindow.document;
diff --git a/AngleSharp.Scripting.JavaScript.Tests/packages.config b/AngleSharp.Scripting.JavaScript.Tests/packages.config
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.4" targetFramework="net46" />
-  <package id="Jint" version="2.7.1" targetFramework="net46" />
-  <package id="NUnit" version="2.6.4" targetFramework="net46" />
+  <package id="AngleSharp" version="0.9.6" targetFramework="net46" />
+  <package id="Jint" version="2.8" targetFramework="net46" />
+  <package id="NUnit" version="3.2.1" targetFramework="net46" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net46" />
 </packages>
diff --git a/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj b/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj
@@ -32,12 +32,12 @@
     <DocumentationFile>bin\Release\AngleSharp.Scripting.JavaScript.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.4.42449, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.4\lib\net45\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.6.41832, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.6\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Jint, Version=2.6.0.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
-      <HintPath>..\packages\Jint.2.7.1\lib\portable-net40+sl50+win+WindowsPhoneApp81+wp80\Jint.dll</HintPath>
+    <Reference Include="Jint, Version=2.7.1.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
+      <HintPath>..\packages\Jint.2.8\lib\portable-net40+sl50+win+WindowsPhoneApp81+wp80\Jint.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/AngleSharp.Scripting.JavaScript/JavaScriptEngine.cs b/AngleSharp.Scripting.JavaScript/JavaScriptEngine.cs
@@ -9,15 +9,23 @@
     using System.IO;
     using System.Runtime.CompilerServices;
     using System.Text;
+    using System.Threading;
+    using System.Threading.Tasks;
 
     /// <summary>
     /// The JavaScript engine.
     /// </summary>
     public class JavaScriptEngine : IScriptEngine
     {
+        #region Fields
+
         readonly ConditionalWeakTable<IWindow, EngineInstance> _contexts;
         readonly Dictionary<String, Object> _external;
 
+        #endregion
+
+        #region ctor
+
         /// <summary>
         /// Creates a new JavaScript engine.
         /// </summary>
@@ -27,6 +35,10 @@ public JavaScriptEngine()
             _external = new Dictionary<String, Object>();
         }
 
+        #endregion
+
+        #region Properties
+
         /// <summary>
         /// Gets the external assignments.
         /// </summary>
@@ -43,6 +55,10 @@ public String Type
             get { return MimeTypeNames.DefaultJavaScript; }
         }
 
+        #endregion
+
+        #region Methods
+
         /// <summary>
         /// Gets the associated Jint engine, if any.
         /// </summary>
@@ -61,34 +77,29 @@ public Engine GetJint(IDocument document)
         }
 
         /// <summary>
-        /// Evaluates the given source.
+        /// Evaluates the response asynchronously.
         /// </summary>
-        /// <param name="source">The source code to evaluate.</param>
+        /// <param name="response">The response to parse.</param>
         /// <param name="options">The options to consider.</param>
-        public void Evaluate(String source, ScriptOptions options)
+        /// <param name="cancel">The cancellation token to transport.</param>
+        public async Task EvaluateScriptAsync(IResponse response, ScriptOptions options, CancellationToken cancel)
         {
-            var objectContext = options.Context;
             var instance = default(EngineInstance);
-
-            if (!_contexts.TryGetValue(objectContext, out instance))
+            var objectContext = options.Document.DefaultView;
+            
+            using (var reader = new StreamReader(response.Content, options.Encoding ?? Encoding.UTF8, true))
             {
-                _contexts.Add(objectContext, instance = new EngineInstance(objectContext, _external));
-            }
+                var content = await reader.ReadToEndAsync().ConfigureAwait(false);
 
-            instance.RunScript(source);
-        }
+                if (!_contexts.TryGetValue(objectContext, out instance))
+                {
+                    _contexts.Add(objectContext, instance = new EngineInstance(objectContext, _external));
+                }
 
-        /// <summary>
-        /// Evaluates the response.
-        /// </summary>
-        /// <param name="response">The response to parse.</param>
-        /// <param name="options">The options to consider.</param>
-        public void Evaluate(IResponse response, ScriptOptions options)
-        {
-            var reader = new StreamReader(response.Content, options.Encoding ?? Encoding.UTF8, true);
-            var content = reader.ReadToEnd();
-            reader.Close();
-            Evaluate(content, options);
+                instance.RunScript(content);
+            }
         }
+
+        #endregion
     }
 }
diff --git a/AngleSharp.Scripting.JavaScript/packages.config b/AngleSharp.Scripting.JavaScript/packages.config
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.4" targetFramework="net45" />
-  <package id="Jint" version="2.7.1" targetFramework="net45" />
+  <package id="AngleSharp" version="0.9.6" targetFramework="net45" />
+  <package id="Jint" version="2.8" targetFramework="net45" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,14 @@`
`8`	`8`	`public class ConversionTests`
`9`	`9`	`{`
`10`	`10`	`[Test]`
`11`		`- [ExpectedException(typeof(ArgumentNullException))]`
`12`	`11`	`public void ConvertCurrentDocumentOfFreshBrowsingContextWithoutDocumentShouldThrowException()`
`13`	`12`	`{`
`14`	`13`	`var context = BrowsingContext.New();`
`15`		`- var document = context.GetDynamicDocument();`
`16`		`- Assert.IsNotNull(document);`
	`14`	`+ Assert.Catch<ArgumentNullException>(() =>`
	`15`	`+ {`
	`16`	`+ var document = context.GetDynamicDocument();`
	`17`	`+ Assert.IsNotNull(document);`
	`18`	`+ });`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,11 @@ public void RemoveEventListener(String type, DomEventHandler callback = null, Bo`
`156`	`156`	`_window.RemoveEventListener(type, callback, capture);`
`157`	`157`	`}`
`158`	`158`
	`159`	`+ public void InvokeEventListener(Event ev)`
	`160`	`+ {`
	`161`	`+ _window.InvokeEventListener(ev);`
	`162`	`+ }`
	`163`	`+`
`159`	`164`	`public void ClearInterval(Int32 handle = 0)`
`160`	`165`	`{`
`161`	`166`	`_window.ClearInterval(handle);`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public async Task JqueryWithAjaxToDelayedResponse()`
`86`	`86`	`var result = document.QuerySelector("#result");`
`87`	`87`	`Assert.AreEqual("", result.TextContent);`
`88`	`88`	`Assert.IsTrue(req.IsStarted);`
`89`		`- await result.AwaitEvent("xhrdone").ConfigureAwait(false);`
	`89`	`+ await result.AwaitEventAsync("xhrdone").ConfigureAwait(false);`
`90`	`90`	`Assert.AreEqual(message, result.TextContent);`
`91`	`91`	`}`
`92`	`92`