Add CLI option

Add unit tests

XmlSchemaClassGenerator.Console/Program.cs

@@ -43,6 +43,7 @@ static void Main(string[] args)
  var enableUpaCheck = true;
  var generateComplexTypesForCollections = true;
  var useShouldSerialize = false;
+ var separateClasses = false;
 
  var options = new OptionSet {
  { "h|help", "show this message and exit", v => showHelp = v != null },
@@ -91,6 +92,7 @@ A file name may be given by appending a pipe sign (|) followed by a file name (l
  { "da|description", "generate DescriptionAttribute (default is true)", v => generateDescriptionAttribute = v != null },
  { "cc|complexTypesForCollections", "generate complex types for collections (default is true)", v => generateComplexTypesForCollections = v != null },
  { "s|useShouldSerialize", "use ShouldSerialize pattern instead of Specified pattern (default is false)", v => useShouldSerialize = v != null },
+ { "sf|separateFiles", "generate a separate file for each class (default is false)", v => separateClasses = v != null },
  };
 
  var globsAndUris = options.Parse(args);
@@ -156,7 +158,8 @@ A file name may be given by appending a pipe sign (|) followed by a file name (l
  PrivateMemberPrefix = doNotUseUnderscoreInPrivateMemberNames ? "" : "_",
  EnableUpaCheck = enableUpaCheck,
  GenerateComplexTypesForCollections = generateComplexTypesForCollections,
- UseShouldSerializePattern = useShouldSerialize
+ UseShouldSerializePattern = useShouldSerialize,
+ SeparateClasses = separateClasses
  };
 
  if (pclCompatible)

XmlSchemaClassGenerator.Tests/Compiler.cs

@@ -84,7 +84,7 @@ public static Assembly GenerateFiles(string name, IEnumerable<string> files, Gen
  TextValuePropertyName = "Value"
  };
 
- var output = new FileWatcherOutputWriter(Path.Combine("output", name));
+ var output = generatorPrototype.OutputWriter as FileWatcherOutputWriter ?? new FileWatcherOutputWriter(Path.Combine("output", name));
 
  var gen = new Generator
  {
@@ -102,9 +102,12 @@ public static Assembly GenerateFiles(string name, IEnumerable<string> files, Gen
  GenerateDescriptionAttribute = generatorPrototype.GenerateDescriptionAttribute,
  CodeTypeReferenceOptions = generatorPrototype.CodeTypeReferenceOptions,
  TextValuePropertyName = generatorPrototype.TextValuePropertyName,
- EmitOrder = generatorPrototype.EmitOrder
+ EmitOrder = generatorPrototype.EmitOrder,
+ SeparateClasses = generatorPrototype.SeparateClasses
  };
 
+ output.Configuration = gen.Configuration;
+
  gen.Generate(files);
 
  return CompileFiles(name, output.Files);

XmlSchemaClassGenerator.Tests/XmlTests.cs

@@ -205,6 +205,21 @@ public void TestTableau()
  TestSamples("Tableau", TableauPattern);
  }
 
+ [Fact, TestPriority(1)]
+ [UseCulture("en-US")]
+ public void TestSeparateClasses()
+ {
+ var output = new FileWatcherOutputWriter(Path.Combine("output", "Tableau.Separate"));
+ Compiler.Generate("Tableau.Separate", TableauPattern, 
+ new Generator 
+ { 
+ OutputWriter = output, 
+ SeparateClasses = true,
+ EnableDataBinding = true
+ });
+ TestSamples("Tableau.Separate", TableauPattern);
+ }
+
  [Fact, TestPriority(1)]
  [UseCulture("en-US")]
  public void TestDtsx()

XmlSchemaClassGenerator.Tests/XsdElsterDatenabholung5.cs

@@ -36,6 +36,7 @@ public void CanGenerateClasses()
  DataAnnotationMode = DataAnnotationMode.None,
  EmitOrder = true,
  GenerateDescriptionAttribute = true,
+ SeparateClasses = true,
  NamespaceProvider = new NamespaceProvider
  {
  GenerateNamespace = key =>
@@ -76,7 +77,7 @@ public void CanGenerateClasses()
  public void CanCompileClasses()
  {
  var inputPath = GetOutputPath("CanGenerateClasses");
- var fileNames = new DirectoryInfo(inputPath).GetFiles("*.cs").Select(x => x.FullName).ToArray();
+ var fileNames = new DirectoryInfo(inputPath).GetFiles("*.cs", SearchOption.AllDirectories).Select(x => x.FullName).ToArray();
  var assembly = Compiler.CompileFiles("Elster.Test", fileNames);
 
  assembly.GetType("Elster.Datenabholung5.Elster", true);

XmlSchemaClassGenerator/FileOutputWriter.cs

@@ -33,7 +33,7 @@ public override void Write(CodeNamespace cn)
  var cu = new CodeCompileUnit();
  cu.Namespaces.Add(cn);
 
- if (Configuration.SeparateClasses == true)
+ if (Configuration?.SeparateClasses == true)
  {
  WriteSeparateFiles(cn);
  }
@@ -68,49 +68,28 @@ protected virtual void WriteFile(string path, CodeCompileUnit cu)
 
  private void WriteSeparateFiles(CodeNamespace cn)
  {
- try
- {
- string dirPath = Path.Combine(OutputDirectory, ValidateName(cn.Name));
- DirectoryInfo di = null;
- //Create directory to hold the output files
- if (Directory.Exists(dirPath))
- {
- di = Directory.GetParent(dirPath);
- }
- else
- {
- di = Directory.CreateDirectory(dirPath);
- }
-
+ var dirPath = Path.Combine(OutputDirectory, ValidateName(cn.Name));
+ var ccu = new CodeCompileUnit();
+ var cns = new CodeNamespace(ValidateName(cn.Name));
 
- var ccu = new CodeCompileUnit();
- var cns = new CodeNamespace(ValidateName(cn.Name));
+ Directory.CreateDirectory(dirPath);
 
-  cns.Imports.AddRange(cn.Imports.Cast<CodeNamespaceImport>().ToArray());
-  cns.Comments.AddRange(cn.Comments);
-  ccu.Namespaces.Add(cns);
+ cns.Imports.AddRange(cn.Imports.Cast<CodeNamespaceImport>().ToArray());
+ cns.Comments.AddRange(cn.Comments);
+ ccu.Namespaces.Add(cns);
 
- foreach (CodeTypeDeclaration ctd in cn.Types)
- {
- string path = Path.Combine(dirPath, ctd.Name + ".cs");
- cns.Types.Clear();
- cns.Types.Add(ctd);
- Configuration?.WriteLog(path);
- WriteFile(path, ccu);
- }
- }
- catch (System.Exception ae)
+ foreach (CodeTypeDeclaration ctd in cn.Types)
  {
- string s = ae.ToString();
- if (ae.InnerException != null) s = ae.InnerException.Message;
+ var path = Path.Combine(dirPath, ctd.Name + ".cs");
+ cns.Types.Clear();
+ cns.Types.Add(ctd);
+ Configuration?.WriteLog(path);
+ WriteFile(path, ccu);
  }
  }
 
- private string ValidateName(string name)
- {
- string regexSearch = new string(Path.GetInvalidFileNameChars()) + new string(Path.GetInvalidPathChars());
- string validName = Regex.Replace(name, regexSearch, "_");
- return validName.Replace(".", "_");
- }
+ static readonly Regex InvalidCharacters = new Regex($"[{string.Join("", Path.GetInvalidFileNameChars())}]", RegexOptions.Compiled);
+
+ private string ValidateName(string name) => InvalidCharacters.Replace(name, "_");
  }
 }

XmlSchemaClassGenerator/Generator.cs

@@ -12,6 +12,8 @@ public class Generator
  {
  private readonly GeneratorConfiguration _configuration = new GeneratorConfiguration();
 
+ public GeneratorConfiguration Configuration => _configuration;
+
  public NamespaceProvider NamespaceProvider
  {
  get { return _configuration.NamespaceProvider; }

XmlSchemaClassGenerator/GeneratorConfiguration.cs

@@ -246,7 +246,7 @@ public void WriteLog(string message)
  public bool GenerateComplexTypesForCollections { get; set; } = true;
 
  /// <summary>
- /// Separates each classes into an individual C# file
+ /// Separates each class into an individual file
  /// </summary>
  public bool SeparateClasses { get; set; } = false;
  }