Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Xml fixes #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from Nov 19, 2010
Merged

Xml fixes #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73b53a3
Don't add IDREFs to set of missing IDs multiple times
pennae Nov 12, 2010
5150ffd
Add testcase for multiple missing IDs
pennae Nov 16, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,14 +1809,14 @@ public string AssessEachAttributeIdentityConstraint (
MissingIDReferences.Remove (str);
break;
case XmlTokenizedType.IDREF:
if (!idList.Contains (str))
if (!idList.Contains (str) && !MissingIDReferences.Contains (str))
MissingIDReferences.Add (str);
break;
case XmlTokenizedType.IDREFS:
string [] idrefs = (string []) parsedValue;
for (int i = 0; i < idrefs.Length; i++) {
string id = idrefs [i];
if (!idList.Contains (id))
if (!idList.Contains (id) && !MissingIDReferences.Contains (str))
MissingIDReferences.Add (id);
}
break;
Expand Down
31 changes: 31 additions & 0 deletions mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaValidatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,37 @@ public void Bug584664 ()
Validate (File.ReadAllText ("Test/XmlFiles/xsd/584664a.xml"), File.ReadAllText ("Test/XmlFiles/xsd/584664a.xsd"));
Validate (File.ReadAllText ("Test/XmlFiles/xsd/584664b.xml"), File.ReadAllText ("Test/XmlFiles/xsd/584664b.xsd"));
}

[Test]
public void MultipleMissingIds ()
{
var schema = XmlSchema.Read (new StringReader (@"<?xml version=""1.0"" encoding=""utf-8""?>
<xs:schema targetNamespace=""urn:multiple-ids"" elementFormDefault=""qualified"" xmlns=""urn:multiple-ids"" xmlns:xs=""http://www.w3.org/2001/XMLSchema"">
<xs:element name=""root"">
<xs:complexType>
<xs:sequence minOccurs=""0"" maxOccurs=""unbounded"">
<xs:element name=""item"">
<xs:complexType>
<xs:attribute name=""id"" type=""xs:ID"" />
<xs:attribute name=""parent"" type=""xs:IDREF"" />
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>"), null);
var xml = @"<?xml version=""1.0"" encoding=""utf-8""?>
<root xmlns=""urn:multiple-ids"">
<item id=""id2"" parent=""id1"" />
<item id=""id3"" parent=""id1"" />
<item id=""id1"" parent=""id1"" />
</root>";
var document = new XmlDocument ();
document.LoadXml (xml);
document.Schemas = new XmlSchemaSet ();
document.Schemas.Add (schema);
document.Validate (null);
}
}
}

Expand Down