Refactor tests

mganss · Mar 11, 2019 · 04901f7 · 04901f7
1 parent f61b578
commit 04901f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 31 deletions.
diff --git a/XmlSchemaClassGenerator.Tests/Compiler.cs b/XmlSchemaClassGenerator.Tests/Compiler.cs
@@ -109,60 +109,37 @@ public static Assembly GenerateFiles(string name, IEnumerable<string> files, Gen
 
  public static Assembly CompileFiles(string name, IEnumerable<string> files)
  {
- var trustedAssembliesPaths = ((string)AppContext.GetData("TRUSTED_PLATFORM_ASSEMBLIES")).Split(Path.PathSeparator);
- var references = trustedAssembliesPaths
- .Where(p => DependencyAssemblies.Contains(Path.GetFileNameWithoutExtension(p)))
- .Select(p => MetadataReference.CreateFromFile(p))
- .ToList();
- var syntaxTrees = files.Select(f => CSharpSyntaxTree.ParseText(File.ReadAllText(f))).ToList();
- var compilation = CSharpCompilation.Create(name, syntaxTrees)
- .AddReferences(references)
- .WithOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
- var result = Compiler.GenerateAssembly(compilation);
-
- Assert.True(result.Result.Success);
- var errors = result.Result.Diagnostics.Where(d => d.Severity == DiagnosticSeverity.Error);
- Assert.False(errors.Any(), string.Join("\n", errors.Select(e => e.GetMessage())));
- var warnings = result.Result.Diagnostics.Where(d => d.Severity == DiagnosticSeverity.Warning);
- Assert.False(warnings.Any(), string.Join("\n", errors.Select(w => w.GetMessage())));
- Assert.NotNull(result.Assembly);
-
- Assemblies[name] = result.Assembly;
-
- return result.Assembly;
+ return Compile(name, files.Select(f => File.ReadAllText(f)).ToArray());
  }
 
  private static readonly LanguageVersion MaxLanguageVersion = Enum
  .GetValues(typeof(LanguageVersion))
  .Cast<LanguageVersion>()
  .Max();
 
- public static Assembly Compile(string name, string contents, Generator generator)
+ public static Assembly Compile(string name, params string[] contents)
  {
  var trustedAssembliesPaths = ((string)AppContext.GetData("TRUSTED_PLATFORM_ASSEMBLIES")).Split(Path.PathSeparator);
  var references = trustedAssembliesPaths
  .Where(p => DependencyAssemblies.Contains(Path.GetFileNameWithoutExtension(p)))
  .Select(p => MetadataReference.CreateFromFile(p))
  .ToList();
-
  var options = new CSharpParseOptions(kind: SourceCodeKind.Regular, languageVersion: MaxLanguageVersion);
-
- // Return a syntax tree of our source code
- var syntaxTree = CSharpSyntaxTree.ParseText(contents, options);
-
- var compilation = CSharpCompilation.Create(name, new[] { syntaxTree })
+ var syntaxTrees = contents.Select(c => CSharpSyntaxTree.ParseText(c, options));
+ var compilation = CSharpCompilation.Create(name, syntaxTrees)
  .AddReferences(references)
  .WithOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
  var result = Compiler.GenerateAssembly(compilation);
 
-
  Assert.True(result.Result.Success);
  var errors = result.Result.Diagnostics.Where(d => d.Severity == DiagnosticSeverity.Error).ToList();
  Assert.False(errors.Any(), string.Join("\n", errors.Select(e => e.GetMessage())));
  var warnings = result.Result.Diagnostics.Where(d => d.Severity == DiagnosticSeverity.Warning).ToList();
  Assert.False(warnings.Any(), string.Join("\n", errors.Select(w => w.GetMessage())));
  Assert.NotNull(result.Assembly);
 
+ Assemblies[name] = result.Assembly;
+
  return result.Assembly;
  }
  }

diff --git a/XmlSchemaClassGenerator.Tests/XmlTests.cs b/XmlSchemaClassGenerator.Tests/XmlTests.cs
@@ -806,7 +806,7 @@ public void DoNotGenerateIntermediaryClassForArrayElements()
  var contents = ConvertXml(nameof(ComplexTypeWithAttributeGroupExtension), xsd, generator);
  var content = Assert.Single(contents);
 
- var assembly = Compiler.Compile(nameof(DoNotGenerateIntermediaryClassForArrayElements), content, generator);
+ var assembly = Compiler.Compile(nameof(DoNotGenerateIntermediaryClassForArrayElements), content);
 
  var fooType = Assert.Single(assembly.DefinedTypes);
  Assert.NotNull(fooType);
@@ -851,7 +851,7 @@ public void GenerateIntermediaryClassForArrayElements()
  var contents = ConvertXml(nameof(GenerateIntermediaryClassForArrayElements), xsd, generator);
  var content = Assert.Single(contents);
 
- var assembly = Compiler.Compile(nameof(GenerateIntermediaryClassForArrayElements), content, generator);
+ var assembly = Compiler.Compile(nameof(GenerateIntermediaryClassForArrayElements), content);
 
  Assert.True(assembly.DefinedTypes.Count() == 2);
  Assert.Single(assembly.DefinedTypes, x => x.FullName == "Test.Foo");