[cleanup] removing dependency on console project from tests by moving…

… ParseNamespace method to CodeUtilities class
mganss · Oct 2, 2019 · 1645b4f · 1645b4f
1 parent 48a8473
commit 1645b4f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 21 deletions.
diff --git a/XmlSchemaClassGenerator.Console/Program.cs b/XmlSchemaClassGenerator.Console/Program.cs
@@ -117,7 +117,7 @@ A file name may be given by appending a pipe sign (|) followed by a file name (l
  uris.AddRange(expandedGlob);
  }
 
- var namespaceMap = namespaces.Select(n => Utility.ParseNamespace(n, namespacePrefix)).ToNamespaceProvider(key =>
+ var namespaceMap = namespaces.Select(n => CodeUtilities.ParseNamespace(n, namespacePrefix)).ToNamespaceProvider(key =>
  {
  var xn = key.XmlSchemaNamespace;
  var name = string.Join(".", xn.Split('/').Where(p => p != "schema" && GeneratorConfiguration.IdentifierRegex.IsMatch(p))
@@ -182,21 +182,4 @@ static void ShowHelp(OptionSet p)
  p.WriteOptionDescriptions(System.Console.Out);
  }
  }
- public static class Utility
- {
- public static KeyValuePair<NamespaceKey, string> ParseNamespace(string nsArg, string namespacePrefix)
- {
- var parts = nsArg.Split(new[] { '=' }, 2);
- var xmlNs = parts[0];
- var netNs = parts[1];
- var parts2 = xmlNs.Split(new[] { '|' }, 2);
- var source = parts2.Length == 2 ? new Uri(parts2[1], UriKind.RelativeOrAbsolute) : null;
- xmlNs = parts2[0];
- if (!string.IsNullOrEmpty(namespacePrefix))
- {
- netNs = namespacePrefix + "." + netNs;
- }
- return new KeyValuePair<NamespaceKey, string>(new NamespaceKey(source, xmlNs), netNs);
- }
- }
 }
diff --git a/XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj b/XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj
@@ -21,7 +21,6 @@
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\XmlSampleGenerator\XmlSampleGenerator.csproj" />
- <ProjectReference Include="..\XmlSchemaClassGenerator.Console\XmlSchemaClassGenerator.Console.csproj" />
  <ProjectReference Include="..\XmlSchemaClassGenerator\XmlSchemaClassGenerator.csproj" />
  </ItemGroup>
  <ItemGroup>

diff --git a/XmlSchemaClassGenerator.Tests/XmlTests.cs b/XmlSchemaClassGenerator.Tests/XmlTests.cs
@@ -14,7 +14,6 @@
 using Ganss.IO;
 using Microsoft.CodeAnalysis;
 using Microsoft.Xml.XMLGen;
-using XmlSchemaClassGenerator.Console;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -408,7 +407,7 @@ public void TestCustomNamespaces()
  DataAnnotationMode = DataAnnotationMode.All,
  GenerateNullables = true,
  MemberVisitor = (member, model) => { },
- NamespaceProvider = customNamespaceConfig.Select(n => Utility.ParseNamespace(n, null)).ToNamespaceProvider()
+ NamespaceProvider = customNamespaceConfig.Select(n => CodeUtilities.ParseNamespace(n, null)).ToNamespaceProvider()
  });
  Assert.NotNull(assembly);
 

diff --git a/XmlSchemaClassGenerator/CodeUtilities.cs b/XmlSchemaClassGenerator/CodeUtilities.cs
@@ -297,5 +297,20 @@ internal static string NormalizeNewlines(string text)
  };
 
  internal static Uri CreateUri(string uri) => string.IsNullOrEmpty(uri) ? null : new Uri(uri);
+
+ public static KeyValuePair<NamespaceKey, string> ParseNamespace(string nsArg, string namespacePrefix)
+ {
+ var parts = nsArg.Split(new[] { '=' }, 2);
+ var xmlNs = parts[0];
+ var netNs = parts[1];
+ var parts2 = xmlNs.Split(new[] { '|' }, 2);
+ var source = parts2.Length == 2 ? new Uri(parts2[1], UriKind.RelativeOrAbsolute) : null;
+ xmlNs = parts2[0];
+ if (!string.IsNullOrEmpty(namespacePrefix))
+ {
+ netNs = namespacePrefix + "." + netNs;
+ }
+ return new KeyValuePair<NamespaceKey, string>(new NamespaceKey(source, xmlNs), netNs);
+ }
  }
 }