Skip to content

Commit c1942c9

Browse files
FlorianRapplFlorianRappl
committed
Reactivated DTD
1 parent eafdfc0 commit c1942c9

Some content is hidden

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

46 files changed

+4186
-9
lines changed

‎src/AngleSharp.Xml.Tests/Parser/XmlInvalidDocuments.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ namespace AngleSharp.Xml.Tests.Parser
22
{
33
using NUnit.Framework;
44

5-
[TestFixture]
5+
[TestFixture(Ignore = "Activate later when DTD is provided")]
66
public class XmlInvalidDocuments
77
{
88
/// <summary>

‎src/AngleSharp.Xml.Tests/Parser/XmlNamespace.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ namespace AngleSharp.Xml.Tests.Parser
33
using NUnit.Framework;
44
using System.Threading.Tasks;
55

6-
[TestFixture]
6+
[TestFixture(Ignore = "Activate later when DTD is provided")]
77
public class XmlNamespaceTests
88
{
99
[Test]

‎src/AngleSharp.Xml.Tests/Parser/XmlNotWfDocuments.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace AngleSharp.Xml.Tests.Parser
66
/// <summary>
77
/// (Conformance) Tests taken from
88
/// http://www.w3.org/XML/Test/xmlconf-20031210.html
9-
[TestFixture]
9+
[TestFixture(Ignore = "Activate later when DTD is provided")]
1010
public class XmlNotWfDocuments
1111
{
1212
/// <summary>

‎src/AngleSharp.Xml.Tests/Parser/XmlNotWfExtDtd.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ namespace AngleSharp.Xml.Tests.Parser
33
using NUnit.Framework;
44
using System;
55

6-
[TestFixture]
6+
[TestFixture(Ignore = "Activate later when DTD is provided")]
77
public class XmlNotWfExtDtd
88
{
99
/// <summary>

‎src/AngleSharp.Xml.Tests/Parser/XmlValidDocuments.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace AngleSharp.Xml.Tests.Parser
88
/// (Conformance) Tests taken from
99
/// http://www.w3.org/XML/Test/xmlconf-20031210.html
1010
/// </summary>
11-
[TestFixture]
11+
[TestFixture(Ignore = "Activate later when DTD is provided")]
1212
public class XmlValidDocuments
1313
{
1414
/// <summary>

‎src/AngleSharp.Xml.Tests/Parser/XmlValidExtDtd.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ namespace AngleSharp.Xml.Tests.Parser
33
using NUnit.Framework;
44
using System;
55

6-
[TestFixture]
6+
[TestFixture(Ignore = "Activate later when DTD is provided")]
77
public class XmlValidExtDtd
88
{
99
/// <summary>

‎src/AngleSharp.Xml.Tests/TestExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ static class TestExtensions
1010
{
1111
public static IXmlDocument ToXmlDocument(this String sourceCode, IConfiguration configuration = null, Boolean validating = false)
1212
{
13-
var context = BrowsingContext.New(configuration);
13+
var context = BrowsingContext.New(configuration ?? Configuration.Default.WithXml());
1414
var xmlParser = context.GetService<IXmlParser>();
1515
return xmlParser.ParseDocument(sourceCode);
1616
}

‎src/AngleSharp.Xml/Dom/Entity.cs‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
namespace AngleSharp.Xml.Dom
2+
{
3+
using AngleSharp.Attributes;
4+
using AngleSharp.Dom;
5+
using System;
6+
7+
/// <summary>
8+
/// Represents an entity node.
9+
/// </summary>
10+
[DomName("Entity")]
11+
public sealed class Entity : Node
12+
{
13+
#region Fields
14+
15+
String _publicId;
16+
String _systemId;
17+
String _notationName;
18+
String _inputEncoding;
19+
String _xmlVersion;
20+
String _xmlEncoding;
21+
String _value;
22+
23+
#endregion
24+
25+
#region ctor
26+
27+
/// <summary>
28+
/// Creates a new entity node.
29+
/// </summary>
30+
internal Entity()
31+
: this(String.Empty)
32+
{
33+
}
34+
35+
/// <summary>
36+
/// Creates a new entity node.
37+
/// </summary>
38+
internal Entity(String name)
39+
: base(null, name, NodeType.Entity)
40+
{
41+
}
42+
43+
#endregion
44+
45+
#region Properties
46+
47+
/// <summary>
48+
/// Gets the public identiifer.
49+
/// </summary>
50+
[DomName("publicId")]
51+
public String PublicId
52+
{
53+
get { return _publicId; }
54+
}
55+
56+
/// <summary>
57+
/// Gets the system identifier.
58+
/// </summary>
59+
[DomName("systemId")]
60+
public String SystemId
61+
{
62+
get { return _systemId; }
63+
}
64+
65+
/// <summary>
66+
/// Gets the notation name.
67+
/// </summary>
68+
[DomName("notationName")]
69+
public String NotationName
70+
{
71+
get { return _notationName; }
72+
internal set { _notationName = value; }
73+
}
74+
75+
/// <summary>
76+
/// Gets the used input encoding.
77+
/// </summary>
78+
[DomName("inputEncoding")]
79+
public String InputEncoding
80+
{
81+
get { return _inputEncoding; }
82+
}
83+
84+
/// <summary>
85+
/// Gets the used XML encoding.
86+
/// </summary>
87+
[DomName("xmlEncoding")]
88+
public String XmlEncoding
89+
{
90+
get { return _xmlEncoding; }
91+
}
92+
93+
/// <summary>
94+
/// Gets the used XML version.
95+
/// </summary>
96+
[DomName("xmlVersion")]
97+
public String XmlVersion
98+
{
99+
get { return _xmlVersion; }
100+
}
101+
102+
/// <summary>
103+
/// Gets or sets the entity's value.
104+
/// </summary>
105+
[DomName("textContent")]
106+
public override String TextContent
107+
{
108+
get { return NodeValue; }
109+
set { NodeValue = value; }
110+
}
111+
112+
/// <summary>
113+
/// Gets or sets the value of the entity.
114+
/// </summary>
115+
[DomName("nodeValue")]
116+
public override String NodeValue
117+
{
118+
get { return _value; }
119+
set { _value = value; }
120+
}
121+
122+
#endregion
123+
124+
#region Methods
125+
126+
/// <summary>
127+
/// Returns a duplicate of the node on which this method was called.
128+
/// </summary>
129+
public override Node Clone(Document newOwner, Boolean deep)
130+
{
131+
var node = new Entity();
132+
CloneNode(node, newOwner, deep);
133+
node._xmlEncoding = this._xmlEncoding;
134+
node._xmlVersion = this._xmlVersion;
135+
node._systemId = this._systemId;
136+
node._publicId = this._publicId;
137+
node._inputEncoding = this._inputEncoding;
138+
node._notationName = this._notationName;
139+
return node;
140+
}
141+
142+
#endregion
143+
}
144+
}

‎src/AngleSharp.Xml/Dom/Internal/SvgDocument.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ sealed class SvgDocument : Document, ISvgDocument
1313
{
1414
#region Fields
1515

16-
private readonly IElementFactory<Document, ISvgElement> _factory;
16+
private readonly IElementFactory<Document, SvgElement> _factory;
1717

1818
#endregion
1919

@@ -23,7 +23,7 @@ internal SvgDocument(IBrowsingContext context, TextSource source)
2323
: base(context ?? BrowsingContext.New(), source)
2424
{
2525
ContentType = MimeTypeNames.Svg;
26-
_factory = Context.GetFactory<IElementFactory<Document, ISvgElement>>();
26+
_factory = Context.GetFactory<IElementFactory<Document, SvgElement>>();
2727
}
2828

2929
internal SvgDocument(IBrowsingContext context = null)

‎src/AngleSharp.Xml/Dom/Notation.cs‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
namespace AngleSharp.Xml.Dom
2+
{
3+
using AngleSharp.Attributes;
4+
using AngleSharp.Dom;
5+
using System;
6+
7+
/// <summary>
8+
/// Represents a notation node.
9+
/// </summary>
10+
[DomName("Notation")]
11+
public sealed class Notation : Node
12+
{
13+
#region ctor
14+
15+
/// <summary>
16+
/// Creates a new notation node.
17+
/// </summary>
18+
internal Notation(String name)
19+
: base(null, name, NodeType.Notation)
20+
{
21+
}
22+
23+
#endregion
24+
25+
#region Properties
26+
27+
/// <summary>
28+
/// Gets or sets the value of the public identifier.
29+
/// </summary>
30+
[DomName("publicId")]
31+
public String PublicId
32+
{
33+
get;
34+
set;
35+
}
36+
37+
/// <summary>
38+
/// Gets or sets the value of the system identifier.
39+
/// </summary>
40+
[DomName("systemId")]
41+
public String SystemId
42+
{
43+
get;
44+
set;
45+
}
46+
47+
#endregion
48+
49+
#region Methods
50+
51+
/// <summary>
52+
/// Returns a duplicate of the node on which this method was called.
53+
/// </summary>
54+
/// <returns>The duplicate node.</returns>
55+
56+
public override Node Clone(Document newOwner, Boolean deep)
57+
{
58+
var node = new Notation(NodeName);
59+
CloneNode(node, newOwner, deep);
60+
return node;
61+
}
62+
63+
#endregion
64+
}
65+
}

0 commit comments

Comments
 (0)