diff --git a/ICD.Common.Utils.Tests/Extensions/XmlReaderExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/XmlReaderExtensionsTest.cs index ee0176d..0f296c2 100644 --- a/ICD.Common.Utils.Tests/Extensions/XmlReaderExtensionsTest.cs +++ b/ICD.Common.Utils.Tests/Extensions/XmlReaderExtensionsTest.cs @@ -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(() => 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(() => reader.GetAttributeAsInt("attr1")); - reader.SkipToNextElement(); + reader.ReadToNextElement(); Assert.AreEqual(1, reader.GetAttributeAsInt("attr1")); Assert.AreEqual(2, reader.GetAttributeAsInt("attr2")); diff --git a/ICD.Common.Utils.Tests/Xml/IcdXmlReaderTest.cs b/ICD.Common.Utils.Tests/Xml/IcdXmlReaderTest.cs index b099c89..2290a94 100644 --- a/ICD.Common.Utils.Tests/Xml/IcdXmlReaderTest.cs +++ b/ICD.Common.Utils.Tests/Xml/IcdXmlReaderTest.cs @@ -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"); - reader.SkipToNextElement(); + reader.ReadToNextElement(); Assert.AreEqual("test", reader.Value); reader = new IcdXmlReader(""); - reader.SkipToNextElement(); + reader.ReadToNextElement(); Assert.AreEqual("", reader.Value); reader = new IcdXmlReader(""); - 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")); diff --git a/ICD.Common.Utils.Tests/Xml/XmlUtilsTest.cs b/ICD.Common.Utils.Tests/Xml/XmlUtilsTest.cs index b198848..92e7a9f 100644 --- a/ICD.Common.Utils.Tests/Xml/XmlUtilsTest.cs +++ b/ICD.Common.Utils.Tests/Xml/XmlUtilsTest.cs @@ -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 results = reader.GetChildElements(); IcdXmlReader[] children = results.ToArray(); diff --git a/ICD.Common.Utils/Xml/XmlReaderExtensions.cs b/ICD.Common.Utils/Xml/XmlReaderExtensions.cs index 0f2cdc9..e7c7f79 100644 --- a/ICD.Common.Utils/Xml/XmlReaderExtensions.cs +++ b/ICD.Common.Utils/Xml/XmlReaderExtensions.cs @@ -143,11 +143,11 @@ namespace ICD.Common.Utils.Xml } /// - /// Skips the current node to the next element. + /// Continues reading until an element is reached. /// /// [PublicAPI] - public static bool SkipToNextElement(this IcdXmlReader extends) + public static bool ReadToNextElement(this IcdXmlReader extends) { if (extends == null) throw new ArgumentNullException("extends"); @@ -215,7 +215,7 @@ namespace ICD.Common.Utils.Xml foreach (IcdXmlReader output in extends.GetChildElementsAsString().Select(child => new IcdXmlReader(child))) { - output.SkipToNextElement(); + output.ReadToNextElement(); yield return output; } } @@ -233,7 +233,7 @@ namespace ICD.Common.Utils.Xml foreach (IcdXmlReader output in extends.GetChildElementsAsString(element).Select(child => new IcdXmlReader(child))) { - output.SkipToNextElement(); + output.ReadToNextElement(); yield return output; } } @@ -250,7 +250,7 @@ namespace ICD.Common.Utils.Xml throw new ArgumentNullException("extends"); // Step into the first child. - extends.SkipToNextElement(); + extends.ReadToNextElement(); while (extends.NodeType == XmlNodeType.Element || extends.NodeType == XmlNodeType.Comment) { @@ -282,7 +282,7 @@ namespace ICD.Common.Utils.Xml throw new ArgumentNullException("extends"); // Step into the first child. - extends.SkipToNextElement(); + extends.ReadToNextElement(); while (extends.NodeType == XmlNodeType.Element || extends.NodeType == XmlNodeType.Comment) { diff --git a/ICD.Common.Utils/Xml/XmlUtils.cs b/ICD.Common.Utils/Xml/XmlUtils.cs index 71888e4..0b04a9c 100644 --- a/ICD.Common.Utils/Xml/XmlUtils.cs +++ b/ICD.Common.Utils/Xml/XmlUtils.cs @@ -24,7 +24,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); return reader.ReadInnerXml(); @@ -44,7 +44,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - reader.SkipToNextElement(); + reader.ReadToNextElement(); return reader.HasAttribute(name); } } @@ -59,7 +59,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - reader.SkipToNextElement(); + reader.ReadToNextElement(); return reader.GetAttributes(); } } @@ -91,7 +91,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - reader.SkipToNextElement(); + reader.ReadToNextElement(); return reader.GetAttributeAsString(name); } } @@ -107,7 +107,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - reader.SkipToNextElement(); + reader.ReadToNextElement(); return reader.GetAttributeAsInt(name); } } @@ -123,7 +123,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - reader.SkipToNextElement(); + reader.ReadToNextElement(); return reader.GetAttributeAsBool(name); } } @@ -162,7 +162,7 @@ namespace ICD.Common.Utils.Xml using (IcdXmlReader childReader = new IcdXmlReader(xml)) { - if (!childReader.SkipToNextElement()) + if (!childReader.ReadToNextElement()) return; path.Push(childReader.Name); @@ -190,7 +190,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); return reader.HasChildElements(); @@ -208,7 +208,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); return reader.GetChildElement(element); @@ -225,7 +225,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); foreach (IcdXmlReader child in reader.GetChildElements()) @@ -243,7 +243,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); foreach (string item in reader.GetChildElementsAsString(element)) @@ -261,7 +261,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); foreach (string item in reader.GetChildElementsAsString()) @@ -297,7 +297,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); return reader.TryGetChildElementAsString(element, out output); @@ -645,7 +645,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); return reader.ReadElementContentAsString(); @@ -662,7 +662,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); return reader.ReadElementContentAsUint(); @@ -679,7 +679,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); return reader.ReadElementContentAsInt(); @@ -696,7 +696,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); return reader.ReadElementContentAsUShort(); @@ -718,7 +718,7 @@ namespace ICD.Common.Utils.Xml using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); return reader.ReadElementContentAsEnum(ignoreCase); @@ -739,7 +739,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); try @@ -763,7 +763,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to find element in given xml"); try @@ -790,7 +790,7 @@ namespace ICD.Common.Utils.Xml { using (IcdXmlReader reader = new IcdXmlReader(xml)) { - if (!reader.SkipToNextElement()) + if (!reader.ReadToNextElement()) throw new FormatException("Unable to read element name, no element in given xml"); return reader.Name;