A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
feat: support namespace analysis (#662)
Gabriel011fa7520c31
diff --git a/src/dev/impl/DevToys/DevToys.csproj b/src/dev/impl/DevToys/DevToys.csprojindex 7513d0ee6..75e175b1c 100644--- a/src/dev/impl/DevToys/DevToys.csproj+++ b/src/dev/impl/DevToys/DevToys.csproj@@ -161,12 +161,14 @@<Compile Include="ViewModels\Tools\Text\StringEscapeUnescape\StringEscapeUnescapeToolProvider.cs" /><Compile Include="ViewModels\Tools\Text\StringEscapeUnescape\StringEscapeUnescapeToolViewModel.cs" /><Compile Include="ViewModels\Tools\Text\TextGroupToolProvider.cs" />+ <Compile Include="ViewModels\Tools\Text\XmlValidator\NamespaceHelper.cs" /><Compile Include="ViewModels\Tools\Text\XmlValidator\Parsing\ParserBase.cs" /><Compile Include="ViewModels\Tools\Text\XmlValidator\Parsing\ParsingResultBase.cs" /><Compile Include="ViewModels\Tools\Text\XmlValidator\Parsing\XmlParser.cs" /><Compile Include="ViewModels\Tools\Text\XmlValidator\Parsing\XmlParsingResult.cs" /><Compile Include="ViewModels\Tools\Text\XmlValidator\Parsing\XsdParser.cs" /><Compile Include="ViewModels\Tools\Text\XmlValidator\Parsing\XsdParsingResult.cs" />+ <Compile Include="ViewModels\Tools\Text\XmlValidator\XmlNamespace.cs" /><Compile Include="ViewModels\Tools\Text\XmlValidator\XmlValidatorToolProvider.cs" /><Compile Include="ViewModels\Tools\Text\XmlValidator\XmlValidatorToolViewModel.cs" /><Compile Include="Views\Tools\AllTools\AllToolsToolPage.xaml.cs">diff --git a/src/dev/impl/DevToys/Helpers/XmlHelper.cs b/src/dev/impl/DevToys/Helpers/XmlHelper.csindex 7d3db3821..5257e49c9 100644--- a/src/dev/impl/DevToys/Helpers/XmlHelper.cs+++ b/src/dev/impl/DevToys/Helpers/XmlHelper.cs@@ -1,7 +1,6 @@#nullable enableusing System;-using System.IO;using System.Text;using System.Text.RegularExpressions;using System.Xml;diff --git a/src/dev/impl/DevToys/LanguageManager.cs b/src/dev/impl/DevToys/LanguageManager.csindex 1fb3edd14..a24b1fc5c 100644--- a/src/dev/impl/DevToys/LanguageManager.cs+++ b/src/dev/impl/DevToys/LanguageManager.cs@@ -3473,5 +3473,20 @@ namespace DevToys/// Gets the resource SearchKeywords./// </summary>public string SearchKeywords => _resources.GetString("SearchKeywords");++ /// <summary>+ /// Gets the resource XmlNamespacesInconsistentMsg.+ /// </summary>+ public string XmlNamespacesInconsistentMsg => _resources.GetString("XmlNamespacesInconsistentMsg");++ /// <summary>+ /// Gets the resource XsdNamespacesInconsistentMsg.+ /// </summary>+ public string XsdNamespacesInconsistentMsg => _resources.GetString("XsdNamespacesInconsistentMsg");++ /// <summary>+ /// Gets the resource TargetNamespaceNotDefinedInXml.+ /// </summary>+ public string TargetNamespaceNotDefinedInXml => _resources.GetString("TargetNamespaceNotDefinedInXml");}}diff --git a/src/dev/impl/DevToys/Strings/en-US/XmlValidator.resw b/src/dev/impl/DevToys/Strings/en-US/XmlValidator.reswindex a85732757..e3590c544 100644--- a/src/dev/impl/DevToys/Strings/en-US/XmlValidator.resw+++ b/src/dev/impl/DevToys/Strings/en-US/XmlValidator.resw@@ -144,4 +144,13 @@<data name="SearchKeywords" xml:space="preserve"><value>XML XSD Validate</value></data>+ <data name="XmlNamespacesInconsistentMsg" xml:space="preserve">+ <value>Validation result will always be 'valid' since the XML does not define these namespace(s) defined in the XSD: {0}</value>+ </data>+ <data name="XsdNamespacesInconsistentMsg" xml:space="preserve">+ <value>Validation result will always be 'valid' since the XSD does not define these namespace(s) defined in the XML: {0}</value>+ </data>+ <data name="TargetNamespaceNotDefinedInXml" xml:space="preserve">+ <value>Validation result will potentially always be 'valid' since the XML does not reference the following "targetNamespace" defined in the XSD: {0}</value>+ </data></root>\ No newline at end of filediff --git a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/NamespaceHelper.cs b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/NamespaceHelper.csnew file mode 100644index 000000000..bf80408e9--- /dev/null+++ b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/NamespaceHelper.cs@@ -0,0 +1,66 @@+#nullable enable+using System;+using System.Collections.Generic;+using System.Linq;+using DevToys.ViewModels.Tools.XmlValidator.Parsing;++namespace DevToys.ViewModels.Tools.XmlValidator+{+ internal static class NamespaceHelper+ {+ /// <summary>+ /// Identifies namespaces used within the XML data but not defined in the XSD schema.+ /// </summary>+ /// <param name="xsdParsingResult">XSD parsing result</param>+ /// <param name="xmlParsingResult">XML parsing result</param>+ /// <returns>The missing namespaces.</returns>+ public static IEnumerable<XmlNamespace> GetMissingNamespacesInXsd(XsdParsingResult xsdParsingResult, XmlParsingResult xmlParsingResult)+ {+ IEnumerable<XmlNamespace> clearedXdsNamespaces = GetNamespacesFromXsd(xsdParsingResult);+ IEnumerable<XmlNamespace> xmlNamespaces = xmlParsingResult.Namespaces;++ // filter targetNamespace+ if (xsdParsingResult.TargetNamespace is not null)+ {+ xmlNamespaces = xmlNamespaces.Where(xns => !string.Equals(xns.Uri, xsdParsingResult.TargetNamespace, StringComparison.InvariantCultureIgnoreCase));+ }++ return xmlNamespaces.Where(ns => clearedXdsNamespaces.Contains(ns) == false);+ }++ /// <summary>+ /// Identifies namespaces defined within the XSD schema but not used in the XML data.+ /// </summary>+ /// <param name="xsdParsingResult">XSD parsing result</param>+ /// <param name="xmlParsingResult">XML parsing result</param>+ /// <returns>The missing namespaces</returns>+ public static IEnumerable<XmlNamespace> GetMissingNamespacesInXml(XsdParsingResult xsdParsingResult, XmlParsingResult xmlParsingResult)+ {+ IEnumerable<XmlNamespace> clearedXdsNamespaces = GetNamespacesFromXsd(xsdParsingResult);+ IEnumerable<XmlNamespace> xmlNamespaces = xmlParsingResult.Namespaces;++ return clearedXdsNamespaces.Where(ns => xmlNamespaces.Contains(ns) == false);+ }++ public static bool DetectMissingTargetNamespaceInXml(XsdParsingResult xsdParsingResult, XmlParsingResult xmlParsingResult, out string? missingTargetNamespaceUri)+ {+ bool isTargetNamespaceDefinedInXml = xmlParsingResult.Namespaces.Select(ns => ns.Uri).Any(uri => string.Equals(uri, xsdParsingResult.TargetNamespace));+ if (isTargetNamespaceDefinedInXml)+ {+ missingTargetNamespaceUri = null;+ return false;+ }++ missingTargetNamespaceUri = xsdParsingResult.TargetNamespace;+ return true;+ }++ private static IEnumerable<XmlNamespace> GetNamespacesFromXsd(XsdParsingResult xsdParsingResult)+ {+ static bool IsDefaultXsdNamespace(XmlNamespace xmlNamespace) => xmlNamespace.Prefix.StartsWith("xs", StringComparison.InvariantCultureIgnoreCase);++ // return namespaces without default XSD namespace (xmlns:xs="http://www.w3.org/2001/XMLSchema")+ return xsdParsingResult.Namespaces.Where(xns => !IsDefaultXsdNamespace(xns));+ }+ }+}diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/ParserBase.cs b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/ParserBase.csindex 2cae5cf84..ea7cf17d8 100644--- a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/ParserBase.cs+++ b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/ParserBase.cs@@ -2,11 +2,15 @@using System;using System.Collections.Generic;+using System.Linq;+using System.Xml;+using System.Xml.Linq;using System.Xml.Schema;+using System.Xml.XPath;namespace DevToys.ViewModels.Tools.XmlValidator.Parsing{- internal abstract class ParserBase<TResult>+ internal abstract class ParserBase<TResult> where TResult : ParsingResultBase{protected readonly string Source;private readonly List<string> _validationWarnings;@@ -23,8 +27,26 @@ namespace DevToys.ViewModels.Tools.XmlValidator.Parsing_validationErrors = new List<string>();}- internal abstract TResult Parse(string content);+ internal TResult Parse(string content)+ {+ TResult result = ParsingOperation(content);++ XDocument document;+ try+ {+ document = XDocument.Parse(content);+ }+ catch+ {+ document = new XDocument();+ }+ result.Namespaces = GetAllNamespaces(document);+ return result;+ }++ protected abstract TResult ParsingOperation(string content);+internal void ValidationErrorCallBack(object sender, ValidationEventArgs e){string information =@@ -55,5 +77,19 @@ namespace DevToys.ViewModels.Tools.XmlValidator.Parsingmessages += string.Join(Environment.NewLine, _validationWarnings);return messages;}++ /// <summary>+ /// Extracts all <c>xmlns</c> namespaces from a given <paramref name="xmlDocument"/>.+ /// </summary>+ /// <param name="xmlDocument">XML document containing namespaces.</param>+ /// <returns></returns>+ private static IEnumerable<XmlNamespace> GetAllNamespaces(XDocument xmlDocument)+ {+ XPathNavigator? navigator = xmlDocument.CreateNavigator();+ navigator.MoveToFollowing(XPathNodeType.Element);++ IDictionary<string, string> namespaces = navigator.GetNamespacesInScope(XmlNamespaceScope.ExcludeXml) ?? new Dictionary<string, string>();+ return namespaces.Select(pair => new XmlNamespace(pair.Key, pair.Value)).ToList();+ }}}diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/ParsingResultBase.cs b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/ParsingResultBase.csindex 31cb06d1a..f2baf30e4 100644--- a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/ParsingResultBase.cs+++ b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/ParsingResultBase.cs@@ -1,10 +1,13 @@#nullable enable+using System.Collections.Generic;+namespace DevToys.ViewModels.Tools.XmlValidator.Parsing{internal record ParsingResultBase{internal bool IsValid { get; set; }internal string? ErrorMessage { get; set; }+ internal IEnumerable<XmlNamespace> Namespaces { get; set; } = new List<XmlNamespace>();}}diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/XmlParser.cs b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/XmlParser.csindex 911535c7f..ee46a85f5 100644--- a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/XmlParser.cs+++ b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/XmlParser.cs@@ -1,8 +1,10 @@#nullable enable+using System.Collections.Generic;using System.Xml;using System.Xml.Linq;using System.Xml.Schema;+using DevToys.Helpers;namespace DevToys.ViewModels.Tools.XmlValidator.Parsing{@@ -15,7 +17,7 @@ namespace DevToys.ViewModels.Tools.XmlValidator.Parsing_xsdSchema = xsdSchema;}- internal override XmlParsingResult Parse(string content)+ protected override XmlParsingResult ParsingOperation(string content){XDocument xmlFile = new();trydiff --git a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/XsdParser.cs b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/XsdParser.csindex 9c9e587bf..a5550897b 100644--- a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/XsdParser.cs+++ b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/XsdParser.cs@@ -12,12 +12,15 @@ namespace DevToys.ViewModels.Tools.XmlValidator.Parsing{}- internal override XsdParsingResult Parse(string xsdContent)+ protected override XsdParsingResult ParsingOperation(string xsdContent){XmlSchema xmlSchema;+ string? targetNamespace;try{- xmlSchema = XmlSchema.Read(new XmlTextReader(new StringReader(xsdContent)), ValidationErrorCallBack);+ using StringReader reader = new(xsdContent);+ xmlSchema = XmlSchema.Read(reader, ValidationErrorCallBack);+ targetNamespace = string.Equals(xmlSchema.TargetNamespace, string.Empty) ? null : xmlSchema.TargetNamespace;}catch (XmlException ex){@@ -36,7 +39,8 @@ namespace DevToys.ViewModels.Tools.XmlValidator.ParsingXmlSchemaSet schema = new();schema.Add(xmlSchema);schema.Compile();- return new XsdParsingResult {IsValid = true, SchemaSet = schema};++ return new XsdParsingResult {IsValid = true, SchemaSet = schema, TargetNamespace = targetNamespace};}private static XsdParsingResult GetInvalidParsingResult(string source, int lineNumber, int linePosition,diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/XsdParsingResult.cs b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/XsdParsingResult.csindex 09bc37eee..d70dad758 100644--- a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/XsdParsingResult.cs+++ b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/Parsing/XsdParsingResult.cs@@ -6,6 +6,7 @@ namespace DevToys.ViewModels.Tools.XmlValidator.Parsing{internal record XsdParsingResult : ParsingResultBase{+ internal string? TargetNamespace { get; set; }internal XmlSchemaSet? SchemaSet { get; set; }}}diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/XmlNamespace.cs b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/XmlNamespace.csnew file mode 100644index 000000000..e4abca1eb--- /dev/null+++ b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/XmlNamespace.cs@@ -0,0 +1,10 @@+using System;++namespace DevToys.ViewModels.Tools.XmlValidator+{+ public record XmlNamespace(string Prefix, string Uri)+ {+ public string Prefix { get; } = Prefix ?? throw new ArgumentNullException(nameof(Prefix));+ public string Uri { get; } = Uri ?? throw new ArgumentNullException(nameof(Uri));+ }+}diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/XmlValidatorToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/XmlValidatorToolProvider.csindex 0ed93f9f2..71e35e4e1 100644--- a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/XmlValidatorToolProvider.cs+++ b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/XmlValidatorToolProvider.cs@@ -6,9 +6,7 @@ using System.IO;using System.Xml;using System.Xml.Linq;using System.Xml.Schema;-using Windows.UI.Xaml.Controls;using DevToys.Api.Tools;-using DevToys.Core.Threading;using DevToys.Shared.Api.Core;namespace DevToys.ViewModels.Tools.XmlValidatordiff --git a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/XmlValidatorToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/XmlValidatorToolViewModel.csindex 0c94feee9..6c9671811 100644--- a/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/XmlValidatorToolViewModel.cs+++ b/src/dev/impl/DevToys/ViewModels/Tools/Text/XmlValidator/XmlValidatorToolViewModel.cs@@ -1,7 +1,9 @@#nullable enableusing System;+using System.Collections.Generic;using System.Composition;+using System.Linq;using System.Xml.Schema;using DevToys.Api.Core.Settings;using DevToys.Api.Tools;@@ -18,11 +20,11 @@ namespace DevToys.ViewModels.Tools.XmlValidatorpublic class XmlValidatorToolViewModel : ObservableRecipient, IToolViewModel{private readonly XmlValidatorStrings _localizedStrings;-+private string? _xsdSchemaData;private string? _xmlData;- private XmlParsingResult? _parsedXml;- private XsdParsingResult? _parsedXsdScheme;+ private XmlParsingResult? _xmlParsingResult;+ private XsdParsingResult? _xsdSchemeParsingResult;private InfoBarData? _validationResult;internal ISettingsProvider SettingsProvider { get; }@@ -38,7 +40,7 @@ namespace DevToys.ViewModels.Tools.XmlValidatorProcessNewXsdData();}}-+internal string? XmlData{get => _xmlData;@@ -55,15 +57,15 @@ namespace DevToys.ViewModels.Tools.XmlValidatorget => _validationResult;private set => SetProperty(ref _validationResult, value);}-+public Type View { get; } = typeof(XmlValidatorToolPage);-+[ImportingConstructor]public XmlValidatorToolViewModel(ISettingsProvider settingsProvider){SettingsProvider = settingsProvider;_localizedStrings = new XmlValidatorStrings();-+DisplayValidationInfoBar();}@@ -71,15 +73,15 @@ namespace DevToys.ViewModels.Tools.XmlValidator{if (string.IsNullOrWhiteSpace(_xmlData)){- _parsedXml = null;+ _xmlParsingResult = null;DisplayValidationInfoBar();return;}-- XmlSchemaSet schemaSet = _parsedXsdScheme?.SchemaSet ?? new XmlSchemaSet();++ XmlSchemaSet schemaSet = _xsdSchemeParsingResult?.SchemaSet ?? new XmlSchemaSet();XmlParser xmlParser = new("XML data", schemaSet);- _parsedXml = xmlParser.Parse(_xmlData ?? String.Empty);-+ _xmlParsingResult = xmlParser.Parse(_xmlData ?? String.Empty);+DisplayValidationInfoBar();}@@ -87,48 +89,133 @@ namespace DevToys.ViewModels.Tools.XmlValidator{if (string.IsNullOrWhiteSpace(_xsdSchemaData)){- _parsedXsdScheme = null;+ _xsdSchemeParsingResult = null;DisplayValidationInfoBar();return;}-+XsdParser xsdParser = new("XSD data");- _parsedXsdScheme = xsdParser.Parse(_xsdSchemaData ?? string.Empty);-+ _xsdSchemeParsingResult = xsdParser.Parse(_xsdSchemaData ?? string.Empty);+DisplayValidationInfoBar();}private void DisplayValidationInfoBar(){- if (_parsedXsdScheme is null || _parsedXml is null)+ if (_xsdSchemeParsingResult is null || _xmlParsingResult is null){string validationImpossibleMsg = _localizedStrings.ValidationImpossibleMsg;ValidationResult = new InfoBarData(InfoBarSeverity.Informational, validationImpossibleMsg);return;}++ bool wasValidationPerformedWithoutErrors = string.IsNullOrEmpty(_xmlParsingResult.ErrorMessage) &&+ string.IsNullOrEmpty(_xmlParsingResult.ErrorMessage);++ List<string> namespaceErrors = new();+ bool areAllNamespacesDefinedInXsd = DetectMissingNamespacesInXsd(_xsdSchemeParsingResult, _xmlParsingResult, out string? nsMissingInXsdErrorMessage);+ if (!areAllNamespacesDefinedInXsd)+ {+ namespaceErrors.Add(nsMissingInXsdErrorMessage!);+ }++ bool areAllNamespacesDefinedInXml = DetectMissingNamespacesInXml(_xsdSchemeParsingResult, _xmlParsingResult, out string? nsMissingInXmlErrorMessage);+ if (!areAllNamespacesDefinedInXml)+ {+ namespaceErrors.Add(nsMissingInXmlErrorMessage!);+ }InfoBarSeverity infoBarSeverity;- string message = _parsedXml.ErrorMessage + Environment.NewLine + _parsedXsdScheme.ErrorMessage;- message = message.Trim();-- bool wasValidationPerformedWithoutErrors = string.IsNullOrEmpty(_parsedXml.ErrorMessage) &&- string.IsNullOrEmpty(_parsedXml.ErrorMessage);-- if (!_parsedXsdScheme.IsValid || !_parsedXml.IsValid)+ string message = String.Empty;+ if (!_xsdSchemeParsingResult.IsValid || !_xmlParsingResult.IsValid){infoBarSeverity = InfoBarSeverity.Error;}- else if (wasValidationPerformedWithoutErrors is not true)+ else if (!wasValidationPerformedWithoutErrors)+ {+ infoBarSeverity = InfoBarSeverity.Warning;+ message = _xmlParsingResult.ErrorMessage + Environment.NewLine + _xsdSchemeParsingResult.ErrorMessage;+ }+ else if (!areAllNamespacesDefinedInXsd || !areAllNamespacesDefinedInXml){infoBarSeverity = InfoBarSeverity.Warning;+ message = string.Join(Environment.NewLine, namespaceErrors);}else{- infoBarSeverity= InfoBarSeverity.Success;+ infoBarSeverity = InfoBarSeverity.Success;message = _localizedStrings.XmlIsValidMessage;}ValidationResult = new InfoBarData(infoBarSeverity, message);}++ private bool DetectMissingNamespacesInXsd(XsdParsingResult xsdParsingResult, XmlParsingResult xmlParsingResult, out string? errorMessage)+ {+ errorMessage = null;++ IEnumerable<XmlNamespace> namespacesMissingInXsd = NamespaceHelper.GetMissingNamespacesInXsd(xsdParsingResult, xmlParsingResult);+ bool areAllNamespacesDefinedInXsd = !namespacesMissingInXsd.Any();+ if (!areAllNamespacesDefinedInXsd)+ {+ string missingNamespacesFormatted = FormatNamespaces(namespacesMissingInXsd);+ errorMessage =+ string.Format(_localizedStrings.XsdNamespacesInconsistentMsg, missingNamespacesFormatted);+ }++ bool isTargetNamespaceReferenceMissingInXml = NamespaceHelper.DetectMissingTargetNamespaceInXml(xsdParsingResult, xmlParsingResult, out string? missingTargetNamespace);+ if (isTargetNamespaceReferenceMissingInXml)+ {+ string formattedErrorMsg = string.Format(_localizedStrings.TargetNamespaceNotDefinedInXml, missingTargetNamespace);++ if (errorMessage is null)+ {+ errorMessage = formattedErrorMsg;+ }+ else+ {+ errorMessage += Environment.NewLine + formattedErrorMsg;+ }+ }++ return areAllNamespacesDefinedInXsd && !isTargetNamespaceReferenceMissingInXml;+ }++ private bool DetectMissingNamespacesInXml(XsdParsingResult xsdParsingResult, XmlParsingResult xmlParsingResult,+ out string? errorMessage)+ {+ List<XmlNamespace> namespacesMissingInXml = NamespaceHelper.GetMissingNamespacesInXml(xsdParsingResult, xmlParsingResult).ToList();+ bool areAllNamespacesDefinedInXml = !namespacesMissingInXml.Any();+ if (!areAllNamespacesDefinedInXml)+ {+ string missingNamespacesFormatted = FormatNamespaces(namespacesMissingInXml);+ errorMessage = string.Format(_localizedStrings.XmlNamespacesInconsistentMsg, missingNamespacesFormatted);+ return false;+ }++ errorMessage = null;+ return true;+ }++ private static string FormatNamespaces(IEnumerable<XmlNamespace> namespaces)+ {+ List<string> missingNamespaces = new();+ foreach(XmlNamespace ns in namespaces)+ {+ string formattedPrefix = string.Empty;+ if (string.Equals(ns.Prefix, string.Empty))+ {+ formattedPrefix = "xmlns";+ }+ else+ {+ formattedPrefix = $"xmlns:{ns.Prefix}";+ }++ missingNamespaces.Add(formattedPrefix + $"=\"{ns.Uri}\"");+ }++ return string.Join(", ", missingNamespaces);+ }}}diff --git a/src/tests/DevToys.Tests/DevToys.Tests.csproj b/src/tests/DevToys.Tests/DevToys.Tests.csprojindex 77deb8c53..6b327f5c3 100644--- a/src/tests/DevToys.Tests/DevToys.Tests.csproj+++ b/src/tests/DevToys.Tests/DevToys.Tests.csproj@@ -63,7 +63,9 @@<Compile Include="Providers\Tools\StringUtilitiesTests.cs" /><Compile Include="Providers\Tools\TestDataProvider.cs" /><Compile Include="Providers\Tools\JwtDecoderTests.cs" />- <Compile Include="Providers\Tools\XmlValidatorTests.cs" />+ <Compile Include="Providers\Tools\XmlValidator\NamespaceHelperTests.cs" />+ <Compile Include="Providers\Tools\XmlValidator\XmlParsingTests.cs" />+ <Compile Include="Providers\Tools\XmlValidator\XsdParsingTests.cs" /><Compile Include="UI\ConvertersTests.cs" /><Compile Include="UnitTestApp.xaml.cs"><DependentUpon>UnitTestApp.xaml</DependentUpon>@@ -105,10 +107,15 @@<EmbeddedResource Include="Providers\TestData\Jwt\RS\ComplexToken.txt" /><EmbeddedResource Include="Providers\TestData\Jwt\RS\PrivateKey.txt" /><EmbeddedResource Include="Providers\TestData\Jwt\RS\PublicKey.txt" />- <EmbeddedResource Include="Providers\TestData\InvalidXml.xml" />- <EmbeddedResource Include="Providers\TestData\InvalidXsd.xml" />- <EmbeddedResource Include="Providers\TestData\ValidXml.xml" />- <EmbeddedResource Include="Providers\TestData\ValidXsd.xml" />+ <EmbeddedResource Include="Providers\TestData\Xml\InvalidXml.xml" />+ <EmbeddedResource Include="Providers\TestData\Xml\InvalidXsd.xml" />+ <EmbeddedResource Include="Providers\TestData\Xml\ValidXml.xml" />+ <EmbeddedResource Include="Providers\TestData\Xml\ValidXmlWithNamespace.xml" />+ <EmbeddedResource Include="Providers\TestData\Xml\ValidXmlWithoutNamespace.xml" />+ <EmbeddedResource Include="Providers\TestData\Xml\ValidXsd.xml" />+ <EmbeddedResource Include="Providers\TestData\Xml\ValidXsdWithNamespace.xml" />+ <EmbeddedResource Include="Providers\TestData\Xml\ValidXsdWithoutNamespace.xml" />+ <EmbeddedResource Include="Providers\TestData\Xml\ValidXsdOnlyWithTargetNamespace.xml" /></ItemGroup><ItemGroup><PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />@@ -128,7 +135,6 @@<Name>DevToys.Shared</Name></ProjectReference></ItemGroup>- <ItemGroup /><ItemGroup><EmbeddedResource Include="Providers\TestData\Jwt\BasicPayload.json" /><EmbeddedResource Include="Providers\TestData\Jwt\ComplexPayload.json" />diff --git a/src/tests/DevToys.Tests/Providers/TestData/InvalidXml.xml b/src/tests/DevToys.Tests/Providers/TestData/Xml/InvalidXml.xmlsimilarity index 100%rename from src/tests/DevToys.Tests/Providers/TestData/InvalidXml.xmlrename to src/tests/DevToys.Tests/Providers/TestData/Xml/InvalidXml.xmldiff --git a/src/tests/DevToys.Tests/Providers/TestData/InvalidXsd.xml b/src/tests/DevToys.Tests/Providers/TestData/Xml/InvalidXsd.xmlsimilarity index 100%rename from src/tests/DevToys.Tests/Providers/TestData/InvalidXsd.xmlrename to src/tests/DevToys.Tests/Providers/TestData/Xml/InvalidXsd.xmldiff --git a/src/tests/DevToys.Tests/Providers/TestData/ValidXml.xml b/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXml.xmlsimilarity index 100%rename from src/tests/DevToys.Tests/Providers/TestData/ValidXml.xmlrename to src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXml.xmldiff --git a/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXmlWithNamespace.xml b/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXmlWithNamespace.xmlnew file mode 100644index 000000000..b6462fdd9--- /dev/null+++ b/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXmlWithNamespace.xml@@ -0,0 +1,7 @@+<?xml version="1.0"?>+<note xmlns="https://www.w3schools.com">+ <to>Tove</to>+ <from>Jani</from>+ <heading>Reminder</heading>+ <body>Don't forget me this weekend!</body>+</note>\ No newline at end of filediff --git a/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXmlWithoutNamespace.xml b/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXmlWithoutNamespace.xmlnew file mode 100644index 000000000..e6b3ff6a5--- /dev/null+++ b/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXmlWithoutNamespace.xml@@ -0,0 +1,7 @@+<?xml version="1.0"?>+<note>+ <to>Tove</to>+ <from>Jani</from>+ <heading>Reminder</heading>+ <body>Don't forget me this weekend!</body>+</note>\ No newline at end of filediff --git a/src/tests/DevToys.Tests/Providers/TestData/ValidXsd.xml b/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXsd.xmlsimilarity index 100%rename from src/tests/DevToys.Tests/Providers/TestData/ValidXsd.xmlrename to src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXsd.xmldiff --git a/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXsdOnlyWithTargetNamespace.xml b/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXsdOnlyWithTargetNamespace.xmlnew file mode 100644index 000000000..30e05557f--- /dev/null+++ b/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXsdOnlyWithTargetNamespace.xml@@ -0,0 +1,15 @@+<?xml version="1.0"?>+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"+targetNamespace="https://www.w3schools.com"+elementFormDefault="qualified">+ <xs:element name="note">+ <xs:complexType>+ <xs:sequence>+ <xs:element name="to" type="xs:string"/>+ <xs:element name="from" type="xs:string"/>+ <xs:element name="heading" type="xs:string"/>+ <xs:element name="body" type="xs:string"/>+ </xs:sequence>+ </xs:complexType>+ </xs:element>+</xs:schema>\ No newline at end of filediff --git a/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXsdWithNamespace.xml b/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXsdWithNamespace.xmlnew file mode 100644index 000000000..33a941876--- /dev/null+++ b/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXsdWithNamespace.xml@@ -0,0 +1,16 @@+<?xml version="1.0"?>+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"+targetNamespace="https://www.w3schools.com"+xmlns="https://www.w3schools.com"+elementFormDefault="qualified">+ <xs:element name="note">+ <xs:complexType>+ <xs:sequence>+ <xs:element name="to" type="xs:string"/>+ <xs:element name="from" type="xs:string"/>+ <xs:element name="heading" type="xs:string"/>+ <xs:element name="body" type="xs:string"/>+ </xs:sequence>+ </xs:complexType>+ </xs:element>+</xs:schema>\ No newline at end of filediff --git a/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXsdWithoutNamespace.xml b/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXsdWithoutNamespace.xmlnew file mode 100644index 000000000..f8a4d0598--- /dev/null+++ b/src/tests/DevToys.Tests/Providers/TestData/Xml/ValidXsdWithoutNamespace.xml@@ -0,0 +1,13 @@+<?xml version="1.0"?>+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">+ <xs:element name="note">+ <xs:complexType>+ <xs:sequence>+ <xs:element name="to" type="xs:string"/>+ <xs:element name="from" type="xs:string"/>+ <xs:element name="heading" type="xs:string"/>+ <xs:element name="body" type="xs:string"/>+ </xs:sequence>+ </xs:complexType>+ </xs:element>+</xs:schema>\ No newline at end of filediff --git a/src/tests/DevToys.Tests/Providers/Tools/TestDataProvider.cs b/src/tests/DevToys.Tests/Providers/Tools/TestDataProvider.csindex 9c68e9c20..05f372413 100644--- a/src/tests/DevToys.Tests/Providers/Tools/TestDataProvider.cs+++ b/src/tests/DevToys.Tests/Providers/Tools/TestDataProvider.cs@@ -6,10 +6,15 @@ namespace DevToys.Tests.Providers.Tools{public static class TestDataProvider{- public static async Task<string> GetFileContent(string filename)+ /// <summary>+ /// Retrieves the content of a file.+ /// </summary>+ /// <param name="filePath">Path to the file relative to <c>DevToys.Tests.Providers.TestData</c></param>+ /// <returns></returns>+ public static async Task<string> GetFileContent(string filePath){Assembly assembly = Assembly.GetExecutingAssembly();- Stream resourceStream = assembly.GetManifestResourceStream("DevToys.Tests.Providers.TestData." + filename);+ Stream resourceStream = assembly.GetManifestResourceStream("DevToys.Tests.Providers.TestData." + filePath);StreamReader streamReader = new StreamReader(resourceStream);return await streamReader.ReadToEndAsync();diff --git a/src/tests/DevToys.Tests/Providers/Tools/XmlValidator/NamespaceHelperTests.cs b/src/tests/DevToys.Tests/Providers/Tools/XmlValidator/NamespaceHelperTests.csnew file mode 100644index 000000000..4ae98e405--- /dev/null+++ b/src/tests/DevToys.Tests/Providers/Tools/XmlValidator/NamespaceHelperTests.cs@@ -0,0 +1,119 @@+using System.Collections.Generic;+using System.Linq;+using System.Threading.Tasks;+using DevToys.ViewModels.Tools.XmlValidator;+using DevToys.ViewModels.Tools.XmlValidator.Parsing;+using Microsoft.VisualStudio.TestTools.UnitTesting;++namespace DevToys.Tests.Providers.Tools+{+ [TestClass]+ public class NamespaceHelperTests+ {+ [TestMethod]+ public async Task GetMissingNamespaces_NoNamespacesMissing_ReturnsNoNamespacesMissing()+ {+ // Arrange+ string xsdSchemaString = await TestDataProvider.GetFileContent("Xml.ValidXsdWithNamespace.xml");+ XsdParser xsdParser = new XsdParser(xsdSchemaString);+ XsdParsingResult xsdParsingResult = xsdParser.Parse(xsdSchemaString);++ string xmlDataString = await TestDataProvider.GetFileContent("Xml.ValidXmlWithNamespace.xml");+ XmlParser xmlParser = new XmlParser(xmlDataString, xsdParsingResult.SchemaSet);+ XmlParsingResult xmlParsingResult = xmlParser.Parse(xmlDataString);++ // Act+ IEnumerable<XmlNamespace> nsMissingInXml = NamespaceHelper.GetMissingNamespacesInXml(xsdParsingResult, xmlParsingResult);+ IEnumerable<XmlNamespace> nsMissingInXsd = NamespaceHelper.GetMissingNamespacesInXsd(xsdParsingResult, xmlParsingResult);++ // Assert+ Assert.IsFalse(nsMissingInXml.Any());+ Assert.IsFalse(nsMissingInXsd.Any());+ }++ [TestMethod]+ public async Task GetMissingNamespaces_XsdTargetNamespaceIsNotPredefinedElsewereInXsdHeader_ReturnsNoNamespacesMissing()+ {+ // Arrange+ string xsdSchemaString = await TestDataProvider.GetFileContent("Xml.ValidXsd.xml");+ XsdParser xsdParser = new XsdParser(xsdSchemaString);+ XsdParsingResult xsdParsingResult = xsdParser.Parse(xsdSchemaString);++ string xmlDataString = await TestDataProvider.GetFileContent("Xml.ValidXml.xml");+ XmlParser xmlParser = new XmlParser(xmlDataString, xsdParsingResult.SchemaSet);+ XmlParsingResult xmlParsingResult = xmlParser.Parse(xmlDataString);++ // Act+ IEnumerable<XmlNamespace> nsMissingInXml = NamespaceHelper.GetMissingNamespacesInXml(xsdParsingResult, xmlParsingResult);+ IEnumerable<XmlNamespace> nsMissingInXsd = NamespaceHelper.GetMissingNamespacesInXsd(xsdParsingResult, xmlParsingResult);++ // Assert+ Assert.IsFalse(nsMissingInXml.Any());+ Assert.IsFalse(nsMissingInXsd.Any());+ }++ [TestMethod]+ public async Task GetMissingNamespaces_NamespacesMissingInXml_ReturnsOneNamespaceMissing()+ {+ // Arrange+ string xsdSchemaString = await TestDataProvider.GetFileContent("Xml.ValidXsdWithNamespace.xml");+ XsdParser xsdParser = new XsdParser(xsdSchemaString);+ XsdParsingResult xsdParsingResult = xsdParser.Parse(xsdSchemaString);++ string xmlDataString = await TestDataProvider.GetFileContent("Xml.ValidXmlWithoutNamespace.xml");+ XmlParser xmlParser = new XmlParser(xmlDataString, xsdParsingResult.SchemaSet);+ XmlParsingResult xmlParsingResult = xmlParser.Parse(xmlDataString);++ // Act+ IEnumerable<XmlNamespace> nsMissingInXml = NamespaceHelper.GetMissingNamespacesInXml(xsdParsingResult, xmlParsingResult);+ IEnumerable<XmlNamespace> nsMissingInXsd = NamespaceHelper.GetMissingNamespacesInXsd(xsdParsingResult, xmlParsingResult);++ // Assert+ Assert.IsTrue(nsMissingInXml.Count() == 1);+ Assert.IsTrue(nsMissingInXsd.Any() == false);+ Assert.IsTrue(xmlParsingResult.IsValid);+ }++ [TestMethod]+ public async Task GetMissingNamespaces_NamespacesMissingInXsd_ReturnsOneNamespaceMissing()+ {+ // Arrange+ string xsdSchemaString = await TestDataProvider.GetFileContent("Xml.ValidXsdWithoutNamespace.xml");+ XsdParser xsdParser = new XsdParser(xsdSchemaString);+ XsdParsingResult xsdParsingResult = xsdParser.Parse(xsdSchemaString);++ string xmlDataString = await TestDataProvider.GetFileContent("Xml.ValidXmlWithNamespace.xml");+ XmlParser xmlParser = new XmlParser(xmlDataString, xsdParsingResult.SchemaSet);+ XmlParsingResult xmlParsingResult = xmlParser.Parse(xmlDataString);++ // Act+ IEnumerable<XmlNamespace> nsMissingInXml = NamespaceHelper.GetMissingNamespacesInXml(xsdParsingResult, xmlParsingResult);+ IEnumerable<XmlNamespace> nsMissingInXsd = NamespaceHelper.GetMissingNamespacesInXsd(xsdParsingResult, xmlParsingResult);++ // Assert+ Assert.IsTrue(nsMissingInXml.Any() == false);+ Assert.IsTrue(nsMissingInXsd.Count() == 1);+ Assert.IsTrue(xmlParsingResult.IsValid);+ }++ [TestMethod]+ public async Task GetMissingTargetNamespace_XmlIsMissingTargetedNamespace_ReturnsMissingTargetNamespace()+ {+ // Arrange+ string xsdSchemaString = await TestDataProvider.GetFileContent("Xml.ValidXsdOnlyWithTargetNamespace.xml");+ XsdParser xsdParser = new XsdParser(xsdSchemaString);+ XsdParsingResult xsdParsingResult = xsdParser.Parse(xsdSchemaString);++ string xmlDataString = await TestDataProvider.GetFileContent("Xml.ValidXmlWithoutNamespace.xml");+ XmlParser xmlParser = new XmlParser(xmlDataString, xsdParsingResult.SchemaSet);+ XmlParsingResult xmlParsingResult = xmlParser.Parse(xmlDataString);++ // Act+ bool isTargetNamespaceMissing = NamespaceHelper.DetectMissingTargetNamespaceInXml(xsdParsingResult, xmlParsingResult, out string missingTargetNamespace);++ // Assert+ Assert.IsTrue(isTargetNamespaceMissing);+ Assert.IsTrue(string.Equals(missingTargetNamespace, "https://www.w3schools.com"));+ }+ }+}diff --git a/src/tests/DevToys.Tests/Providers/Tools/XmlValidatorTests.cs b/src/tests/DevToys.Tests/Providers/Tools/XmlValidator/XmlParsingTests.cssimilarity index 61%rename from src/tests/DevToys.Tests/Providers/Tools/XmlValidatorTests.csrename to src/tests/DevToys.Tests/Providers/Tools/XmlValidator/XmlParsingTests.csindex c4123dd82..4e5981fe1 100644--- a/src/tests/DevToys.Tests/Providers/Tools/XmlValidatorTests.cs+++ b/src/tests/DevToys.Tests/Providers/Tools/XmlValidator/XmlParsingTests.cs@@ -1,67 +1,21 @@-using System.Threading.Tasks;+using System.Collections.Generic;+using System.Linq;+using System.Threading.Tasks;using System.Xml.Linq;-using System.Xml.Schema;+using DevToys.ViewModels.Tools.XmlValidator;using DevToys.ViewModels.Tools.XmlValidator.Parsing;using Microsoft.VisualStudio.TestTools.UnitTesting;namespace DevToys.Tests.Providers.Tools{[TestClass]- public class XmlValidatorTests+ public class XmlParsingTests{- [TestMethod]- public void Parse_EmptyXsdFile_Fails()- {- // Arrange- string xsdSchemaString = string.Empty;- XsdParser parser = new XsdParser(xsdSchemaString);-- // Act- XsdParsingResult result = parser.Parse(xsdSchemaString);-- // Assert- Assert.IsFalse(result.IsValid);- Assert.IsFalse(string.IsNullOrEmpty(result.ErrorMessage));- Assert.AreEqual(null, result.SchemaSet);- }-- [TestMethod]- public async Task Parse_InvalidXsdSchema_Fails()- {- // Arrange- string xsdSchemaString = await TestDataProvider.GetFileContent("InvalidXsd.xml");- XsdParser parser = new XsdParser(xsdSchemaString);-- // Act- XsdParsingResult result = parser.Parse(xsdSchemaString);-- // Assert- Assert.IsFalse(result.IsValid);- Assert.IsFalse(string.IsNullOrEmpty(result.ErrorMessage));- Assert.AreEqual(null, result.SchemaSet);- }-- [TestMethod]- public async Task Parse_ValidXsdSchema_Succeeds()- {- // Arrange- string xsdSchemaString = await TestDataProvider.GetFileContent("ValidXsd.xml");- XsdParser parser = new XsdParser(xsdSchemaString);-- // Act- XsdParsingResult result = parser.Parse(xsdSchemaString);-- // Assert- Assert.IsTrue(result.IsValid);- Assert.IsTrue(string.IsNullOrEmpty(result.ErrorMessage));- Assert.IsInstanceOfType(result.SchemaSet, typeof(XmlSchemaSet));- }-[TestMethod]public async Task Parse_EmptyXmlFile_Fails(){// Arrange- string xsdSchemaString = await TestDataProvider.GetFileContent("ValidXsd.xml");+ string xsdSchemaString = await TestDataProvider.GetFileContent("Xml.ValidXsd.xml");XsdParser xsdParser = new XsdParser(xsdSchemaString);XsdParsingResult xsdParsingResult = xsdParser.Parse(xsdSchemaString);@@ -81,11 +35,11 @@ namespace DevToys.Tests.Providers.Toolspublic async Task Parse_InvalidXmlFile_Fails(){// Arrange- string xsdSchemaString = await TestDataProvider.GetFileContent("ValidXsd.xml");+ string xsdSchemaString = await TestDataProvider.GetFileContent("Xml.ValidXsd.xml");XsdParser xsdParser = new XsdParser(xsdSchemaString);XsdParsingResult xsdParsingResult = xsdParser.Parse(xsdSchemaString);- string xmlDataString = await TestDataProvider.GetFileContent("InvalidXml.xml");+ string xmlDataString = await TestDataProvider.GetFileContent("Xml.InvalidXml.xml");XmlParser xmlParser = new XmlParser(xmlDataString, xsdParsingResult.SchemaSet);// Act@@ -102,11 +56,11 @@ namespace DevToys.Tests.Providers.Toolspublic async Task Parse_ValidXmlSchema_Succeeds(){// Arrange- string xsdSchemaString = await TestDataProvider.GetFileContent("ValidXsd.xml");+ string xsdSchemaString = await TestDataProvider.GetFileContent("Xml.ValidXsd.xml");XsdParser xsdParser = new XsdParser(xsdSchemaString);XsdParsingResult xsdParsingResult = xsdParser.Parse(xsdSchemaString);- string xmlDataString = await TestDataProvider.GetFileContent("ValidXml.xml");+ string xmlDataString = await TestDataProvider.GetFileContent("Xml.ValidXml.xml");XmlParser xmlParser = new XmlParser(xmlDataString, xsdParsingResult.SchemaSet);// Act@@ -117,5 +71,32 @@ namespace DevToys.Tests.Providers.ToolsAssert.IsTrue(string.IsNullOrEmpty(result.ErrorMessage));Assert.IsInstanceOfType(result.XmlDocument, typeof(XDocument));}++ [TestMethod]+ public async Task Parse_ValidXmlSchema_SucceedsAndExtractsNamespacesCorrectly()+ {+ // Arrange+ string xsdSchemaString = await TestDataProvider.GetFileContent("Xml.ValidXsd.xml");+ XsdParser xsdParser = new XsdParser(xsdSchemaString);+ XsdParsingResult xsdParsingResult = xsdParser.Parse(xsdSchemaString);++ string xmlDataString = await TestDataProvider.GetFileContent("Xml.ValidXml.xml");+ XmlParser xmlParser = new XmlParser(xmlDataString, xsdParsingResult.SchemaSet);++ // Act+ XmlParsingResult result = xmlParser.Parse(xmlDataString);++ // Assert+ Assert.IsTrue(result.IsValid);++ IEnumerable<XmlNamespace> extractedNamespace = result.Namespaces;+ Assert.IsTrue(extractedNamespace.Count() == 1);++ (string namespacePrefix, string namespacePath) = extractedNamespace.First();+ (string expectedNamespacePrefix, string expectedNamespacePath) = ("", @"http://www.contoso.com/books");++ Assert.IsTrue(string.Equals(namespacePrefix, expectedNamespacePrefix));+ Assert.IsTrue(string.Equals(namespacePath, expectedNamespacePath));+ }}}diff --git a/src/tests/DevToys.Tests/Providers/Tools/XmlValidator/XsdParsingTests.cs b/src/tests/DevToys.Tests/Providers/Tools/XmlValidator/XsdParsingTests.csnew file mode 100644index 000000000..d2cbb1a12--- /dev/null+++ b/src/tests/DevToys.Tests/Providers/Tools/XmlValidator/XsdParsingTests.cs@@ -0,0 +1,85 @@+using System.Collections.Generic;+using System.Linq;+using System.Threading.Tasks;+using System.Xml.Schema;+using DevToys.ViewModels.Tools.XmlValidator;+using DevToys.ViewModels.Tools.XmlValidator.Parsing;+using Microsoft.VisualStudio.TestTools.UnitTesting;++namespace DevToys.Tests.Providers.Tools+{+ [TestClass]+ public class XsdParsingTests+ {+ [TestMethod]+ public void Parse_EmptyXsdFile_Fails()+ {+ // Arrange+ string xsdSchemaString = string.Empty;+ XsdParser parser = new XsdParser(xsdSchemaString);++ // Act+ XsdParsingResult result = parser.Parse(xsdSchemaString);++ // Assert+ Assert.IsFalse(result.IsValid);+ Assert.IsFalse(string.IsNullOrEmpty(result.ErrorMessage));+ Assert.AreEqual(null, result.SchemaSet);+ }++ [TestMethod]+ public async Task Parse_InvalidXsdSchema_Fails()+ {+ // Arrange+ string xsdSchemaString = await TestDataProvider.GetFileContent("Xml.InvalidXsd.xml");+ XsdParser parser = new XsdParser(xsdSchemaString);++ // Act+ XsdParsingResult result = parser.Parse(xsdSchemaString);++ // Assert+ Assert.IsFalse(result.IsValid);+ Assert.IsFalse(string.IsNullOrEmpty(result.ErrorMessage));+ Assert.AreEqual(null, result.SchemaSet);+ }++ [TestMethod]+ public async Task Parse_ValidXsdSchema_Succeeds()+ {+ // Arrange+ string xsdSchemaString = await TestDataProvider.GetFileContent("Xml.ValidXsd.xml");+ XsdParser parser = new XsdParser(xsdSchemaString);++ // Act+ XsdParsingResult result = parser.Parse(xsdSchemaString);++ // Assert+ Assert.IsTrue(result.IsValid);+ Assert.IsTrue(string.IsNullOrEmpty(result.ErrorMessage));+ Assert.IsInstanceOfType(result.SchemaSet, typeof(XmlSchemaSet));+ }++ [TestMethod]+ public async Task Parse_ValidXsdSchema_SucceedsAndExtractsNamespacesCorrectly()+ {+ // Arrange+ string xsdSchemaString = await TestDataProvider.GetFileContent("Xml.ValidXsd.xml");+ XsdParser parser = new XsdParser(xsdSchemaString);++ // Act+ XsdParsingResult result = parser.Parse(xsdSchemaString);++ // Assert+ Assert.IsTrue(result.IsValid);++ IEnumerable<XmlNamespace> extractedNamespace = result.Namespaces;+ Assert.IsTrue(extractedNamespace.Count() == 1);++ (string namespacePrefix, string namespacePath) = extractedNamespace.First();+ (string expectedNamespacePrefix, string expectedNamespacePath) = ("xs", @"http://www.w3.org/2001/XMLSchema");++ Assert.IsTrue(string.Equals(namespacePrefix, expectedNamespacePrefix));+ Assert.IsTrue(string.Equals(namespacePath, expectedNamespacePath));+ }+ }+}