Browse Source

Fix bugs in testing infrastructure

pull/1198/head
Siegfried Pammer 7 years ago
parent
commit
79b5048fdc
  1. 8
      ICSharpCode.Decompiler.Tests/Helpers/Tester.cs
  2. 2
      ICSharpCode.Decompiler.Tests/RoundtripAssembly.cs

8
ICSharpCode.Decompiler.Tests/Helpers/Tester.cs

@ -322,7 +322,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers @@ -322,7 +322,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
public static CSharpDecompiler GetDecompilerForSnippet(string csharpText)
{
/*var syntaxTree = SyntaxFactory.ParseSyntaxTree(csharpText);
var syntaxTree = SyntaxFactory.ParseSyntaxTree(csharpText);
var compilation = CSharpCompilation.Create(
"TestAssembly",
new[] { syntaxTree },
@ -332,11 +332,11 @@ namespace ICSharpCode.Decompiler.Tests.Helpers @@ -332,11 +332,11 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
var emitResult = compilation.Emit(peStream);
peStream.Position = 0;
var moduleDefinition = ModuleDefinition.ReadModule(peStream);
var moduleDefinition = new PEFile("TestAssembly.dll", peStream, PEStreamOptions.Default);
moduleDefinition.AssemblyResolver = new UniversalAssemblyResolver(typeof(Tester).Assembly.Location, false, true, moduleDefinition.Reader.DetectTargetFrameworkId(), PEStreamOptions.Default);
var decompiler = new CSharpDecompiler(moduleDefinition, new DecompilerSettings());
return decompiler;*/
throw new NotImplementedException();
return decompiler;
}
internal static string GetSuffix(CSharpCompilerOptions cscOptions)

2
ICSharpCode.Decompiler.Tests/RoundtripAssembly.cs

@ -147,7 +147,7 @@ namespace ICSharpCode.Decompiler.Tests @@ -147,7 +147,7 @@ namespace ICSharpCode.Decompiler.Tests
var resolver = new UniversalAssemblyResolver(file, false, true, module.Reader.DetectTargetFrameworkId(), System.Reflection.PortableExecutable.PEStreamOptions.Default);
resolver.AddSearchDirectory(inputDir);
resolver.RemoveSearchDirectory(".");
module.AssemblyResolver = resolver;
var decompiler = new TestProjectDecompiler(inputDir);
// use a fixed GUID so that we can diff the output between different ILSpy runs without spurious changes
decompiler.ProjectGuid = Guid.Parse("{127C83E4-4587-4CF9-ADCA-799875F3DFE6}");

Loading…
Cancel
Save