From 68357655b4d5966b3675b040d4dba2d09177fca4 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Wed, 1 Nov 2017 23:11:06 +0100 Subject: [PATCH] Add RemovedDeadCode = true to F# ILPretty tests --- ICSharpCode.Decompiler.Tests/Helpers/Tester.cs | 4 ++-- ICSharpCode.Decompiler.Tests/ILPrettyTestRunner.cs | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs b/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs index f75d79759..e23716444 100644 --- a/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs +++ b/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs @@ -256,11 +256,11 @@ namespace ICSharpCode.Decompiler.Tests.Helpers return process.ExitCode; } - public static string DecompileCSharp(string assemblyFileName) + public static string DecompileCSharp(string assemblyFileName, DecompilerSettings settings = null) { using (var module = ModuleDefinition.ReadModule(assemblyFileName)) { var typeSystem = new DecompilerTypeSystem(module); - CSharpDecompiler decompiler = new CSharpDecompiler(typeSystem, new DecompilerSettings()); + CSharpDecompiler decompiler = new CSharpDecompiler(typeSystem, settings ?? new DecompilerSettings()); decompiler.AstTransforms.Insert(0, new RemoveCompilerAttribute()); decompiler.AstTransforms.Add(new EscapeInvalidIdentifiers()); var syntaxTree = decompiler.DecompileWholeModuleAsSingleFile(); diff --git a/ICSharpCode.Decompiler.Tests/ILPrettyTestRunner.cs b/ICSharpCode.Decompiler.Tests/ILPrettyTestRunner.cs index 4afafa3b4..05ff2be06 100644 --- a/ICSharpCode.Decompiler.Tests/ILPrettyTestRunner.cs +++ b/ICSharpCode.Decompiler.Tests/ILPrettyTestRunner.cs @@ -45,34 +45,34 @@ namespace ICSharpCode.Decompiler.Tests [Test] public void FSharpUsing_Debug() { - Run(); + Run(settings: new DecompilerSettings { RemoveDeadCode = true }); } [Test] public void FSharpUsing_Release() { - Run(); + Run(settings: new DecompilerSettings { RemoveDeadCode = true }); } [Test, Ignore] public void FSharpLoops_Debug() { - Run(); + Run(settings: new DecompilerSettings { RemoveDeadCode = true }); } [Test, Ignore] public void FSharpLoops_Release() { - Run(); + Run(settings: new DecompilerSettings { RemoveDeadCode = true }); } - void Run([CallerMemberName] string testName = null) + void Run([CallerMemberName] string testName = null, DecompilerSettings settings = null) { var ilFile = Path.Combine(TestCasePath, testName + ".il"); var csFile = Path.Combine(TestCasePath, testName + ".cs"); var executable = Tester.AssembleIL(ilFile, AssemblerOptions.Library); - var decompiled = Tester.DecompileCSharp(executable); + var decompiled = Tester.DecompileCSharp(executable, settings); CodeAssert.FilesAreEqual(csFile, decompiled); }