Wired DOM parser to exceptions

FlorianRappl · FlorianRappl · commit c5e8db5f3025 · 2019-05-13T12:24:00.000+02:00
diff --git a/src/AngleSharp.Js.Tests/AngleSharp.Js.Tests.csproj b/src/AngleSharp.Js.Tests/AngleSharp.Js.Tests.csproj
@@ -16,6 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="AngleSharp.Css" Version="0.12.0" />
+    <PackageReference Include="AngleSharp.Xml" Version="0.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
diff --git a/src/AngleSharp.Js.Tests/ComponentTests.cs b/src/AngleSharp.Js.Tests/ComponentTests.cs
@@ -1,6 +1,6 @@
 namespace AngleSharp.Js.Tests
 {
-    using Jint;
+    using AngleSharp.Xml;
     using NUnit.Framework;
     using System;
     using System.Threading.Tasks;
@@ -11,7 +11,7 @@ public class ComponentTests
         private static async Task<String> RunScriptComponent(String script)
         {
             var service = new JsScriptingService();
-            var cfg = Configuration.Default.With(service);
+            var cfg = Configuration.Default.WithXml().With(service);
             var html = String.Concat("<!doctype html><script>", script, "</script>");
             var document = await BrowsingContext.New(cfg).OpenAsync(m => m.Content(html));
             var value = service.GetOrCreateJint(document).GetValue("assert");
@@ -41,16 +41,14 @@ public async Task DomParserShouldWorkWithXml()
         }
 
         [Test]
-        public void DomParserShouldNotWorkWithMathMl()
+        public async Task DomParserShouldWorkWithMathMl()
         {
             var script = @"var xmlSource = '<math> <mrow> <msup><mi> a </mi><mn>2</mn></msup> <mo> + </mo> <msup><mi> b </mi><mn>2</mn></msup> <mo> = </mo> <msup><mi> c </mi><mn>2</mn></msup> </mrow> </math>';
 var parser = new DOMParser();
 var doc = parser.parseFromString(xmlSource, 'application/mathml+xml');
-var assert = 'failed';";
-            Assert.CatchAsync<ArgumentException>(async () => 
-            {
-                var value = await RunScriptComponent(script);
-            });
+var assert = 'success';";
+            var value = await RunScriptComponent(script);
+            Assert.AreEqual("success", value);
         }
 
         [Test]
diff --git a/src/AngleSharp.Js/Dom/DomParser.cs b/src/AngleSharp.Js/Dom/DomParser.cs
@@ -52,8 +52,20 @@ public IDocument Parse(String str, String type)
                         { HeaderNames.ContentType, type },
                     },
                 };
-                var task = factory.CreateAsync(ctx, new CreateDocumentOptions(response), default);
-                return task.Result;
+
+                try
+                {
+                    var task = factory.CreateAsync(ctx, new CreateDocumentOptions(response), default);
+                    var document = task.Result;
+                    return document;
+                }
+                catch (Exception ex)
+                {
+                    var message = ex.InnerException?.Message ?? ex.Message ?? "Something went wrong.";
+                    var sourceText = String.Empty;
+                    var error = $"<parsererror xmlns=\"http://www.mozilla.org/newlayout/xml/parsererror.xml\">{message}<sourcetext>{sourceText}</sourcetext></parsererror>";
+                    return Parse(error, MimeTypeNames.Xml);
+                }
             }
         }
     }
