icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-15 12:45:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renaming xml utils method

Browse Source
This commit is contained in:
Chris Cameron
2018-01-22 15:17:42 -05:00
parent 3c3d6fa52e
commit 5724cb3c8c
5 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ICD.Common.Utils.Tests/Extensions/XmlReaderExtensionsTest.cs
View File

@@ -32,7 +32,7 @@ namespace ICD.Common.Utils.Tests.Extensions
Assert.IsFalse(reader.HasAttribute("attr1"));
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.IsTrue(reader.HasAttribute("attr1"));
Assert.IsTrue(reader.HasAttribute("attr2"));
@@ -47,7 +47,7 @@ namespace ICD.Common.Utils.Tests.Extensions
Assert.IsEmpty(reader.GetAttributes());
reader.SkipToNextElement();
reader.ReadToNextElement();
IcdXmlAttribute[] attributes = reader.GetAttributes().ToArray();
Assert.AreEqual(2, attributes.Length);
@@ -62,7 +62,7 @@ namespace ICD.Common.Utils.Tests.Extensions
Assert.Throws<FormatException>(() => reader.GetAttributeAsString("attr1"));
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.AreEqual("1", reader.GetAttributeAsString("attr1"));
Assert.AreEqual("2", reader.GetAttributeAsString("attr2"));
@@ -77,7 +77,7 @@ namespace ICD.Common.Utils.Tests.Extensions
Assert.Throws<FormatException>(() => reader.GetAttributeAsInt("attr1"));
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.AreEqual(1, reader.GetAttributeAsInt("attr1"));
Assert.AreEqual(2, reader.GetAttributeAsInt("attr2"));

16
ICD.Common.Utils.Tests/Xml/IcdXmlReaderTest.cs
View File

@@ -26,22 +26,22 @@ namespace ICD.Common.Utils.Tests.Xml
public void HasAttributesTest()
{
IcdXmlReader reader = new IcdXmlReader(EXAMPLE_XML);
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.IsTrue(reader.HasAttributes);
reader = new IcdXmlReader(EXAMPLE_XML_2);
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.IsFalse(reader.HasAttributes);
}
public void NameTest()
{
IcdXmlReader reader = new IcdXmlReader(EXAMPLE_XML);
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.AreEqual("Level1", reader.Name);
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.AreEqual("Level2", reader.Name);
}
@@ -49,17 +49,17 @@ namespace ICD.Common.Utils.Tests.Xml
public void ValueTest()
{
IcdXmlReader reader = new IcdXmlReader("<Test>test</Test>");
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.AreEqual("test", reader.Value);
reader = new IcdXmlReader("<Test></Test>");
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.AreEqual("", reader.Value);
reader = new IcdXmlReader("<Test />");
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.AreEqual(null, reader.Value);
}
@@ -86,7 +86,7 @@ namespace ICD.Common.Utils.Tests.Xml
public void GetAttributeTest()
{
IcdXmlReader reader = new IcdXmlReader(EXAMPLE_XML);
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.AreEqual("1", reader.GetAttribute("attr1"));
Assert.AreEqual("2", reader.GetAttribute("attr2"));

12
ICD.Common.Utils.Tests/Xml/XmlUtilsTest.cs
View File

@@ -54,7 +54,7 @@ namespace ICD.Common.Utils.Tests.Xml
{
using (IcdXmlReader reader = new IcdXmlReader(EXAMPLE_XML))
{
reader.SkipToNextElement();
reader.ReadToNextElement();
IcdXmlAttribute[] attributes = reader.GetAttributes().ToArray();
@@ -71,7 +71,7 @@ namespace ICD.Common.Utils.Tests.Xml
{
using (IcdXmlReader reader = new IcdXmlReader(EXAMPLE_XML))
{
reader.SkipToNextElement();
reader.ReadToNextElement();
int value = reader.GetAttributeAsInt("attr1");
Assert.AreEqual(1, value);
@@ -102,7 +102,7 @@ namespace ICD.Common.Utils.Tests.Xml
using (IcdXmlReader reader = new IcdXmlReader(nodes[3]))
{
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.AreEqual("Some text", reader.ReadInnerXml());
}
}
@@ -125,10 +125,10 @@ namespace ICD.Common.Utils.Tests.Xml
{
using (IcdXmlReader reader = new IcdXmlReader(EXAMPLE_XML))
{
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.AreEqual("Level1", reader.Name);
reader.SkipToNextElement();
reader.ReadToNextElement();
Assert.AreEqual("Level2", reader.Name);
}
}
@@ -162,7 +162,7 @@ namespace ICD.Common.Utils.Tests.Xml
{
using (IcdXmlReader reader = new IcdXmlReader(EXAMPLE_XML))
{
reader.SkipToNextElement();
reader.ReadToNextElement();
IEnumerable<IcdXmlReader> results = reader.GetChildElements();
IcdXmlReader[] children = results.ToArray();