Browse Source

Move CustomAttributeTests to PrettyTestRunner

pull/1213/head
Siegfried Pammer 7 years ago
parent
commit
8cbf724901
  1. 2
      ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs
  2. 26
      ICSharpCode.Decompiler.Tests/CustomAttributes/CustomAttributeTests.cs
  3. 96
      ICSharpCode.Decompiler.Tests/DecompilerTestBase.cs
  4. 4
      ICSharpCode.Decompiler.Tests/Helpers/Tester.cs
  5. 8
      ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
  6. 2
      ICSharpCode.Decompiler.Tests/ILPrettyTestRunner.cs
  7. 20
      ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs
  8. 2
      ICSharpCode.Decompiler.Tests/RoundtripAssembly.cs
  9. 0
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/AssemblyCustomAttributes.cs
  10. 0
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributeSamples.cs
  11. 0
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes.cs
  12. 2
      ICSharpCode.Decompiler.Tests/UglyTestRunner.cs
  13. 2
      ICSharpCode.Decompiler.Tests/VBPrettyTestRunner.cs

2
ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs

@ -29,7 +29,7 @@ namespace ICSharpCode.Decompiler.Tests @@ -29,7 +29,7 @@ namespace ICSharpCode.Decompiler.Tests
[TestFixture, Parallelizable(ParallelScope.All)]
public class CorrectnessTestRunner
{
static readonly string TestCasePath = DecompilerTestBase.TestCasePath + "/Correctness";
static readonly string TestCasePath = Tester.TestCasePath + "/Correctness";
[Test]
public void AllFilesHaveTests()

26
ICSharpCode.Decompiler.Tests/CustomAttributes/CustomAttributeTests.cs

@ -1,26 +0,0 @@ @@ -1,26 +0,0 @@
using NUnit.Framework;
namespace ICSharpCode.Decompiler.Tests.CustomAttributes
{
[TestFixture]
public class CustomAttributeTests : DecompilerTestBase
{
[Test]
public void CustomAttributeSamples()
{
ValidateFileRoundtrip(@"CustomAttributes/S_CustomAttributeSamples.cs");
}
[Test]
public void CustomAttributes()
{
ValidateFileRoundtrip(@"CustomAttributes/S_CustomAttributes.cs");
}
[Test]
public void AssemblyCustomAttribute()
{
ValidateFileRoundtrip(@"CustomAttributes/S_AssemblyCustomAttribute.cs");
}
}
}

96
ICSharpCode.Decompiler.Tests/DecompilerTestBase.cs

@ -1,96 +0,0 @@ @@ -1,96 +0,0 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.CodeDom.Compiler;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using ICSharpCode.Decompiler.Tests.Helpers;
using Microsoft.CSharp;
using Mono.Cecil;
using ICSharpCode.Decompiler.CSharp;
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
namespace ICSharpCode.Decompiler.Tests
{
public abstract class DecompilerTestBase
{
public static readonly string TestCasePath = Path.Combine(
Path.GetDirectoryName(typeof(DecompilerTestBase).Assembly.Location),
"../../../TestCases");
protected static void ValidateFileRoundtrip(string samplesFileName)
{
var fullPath = Path.Combine(TestCasePath, "..", samplesFileName);
AssertRoundtripCode(fullPath);
}
static string RemoveIgnorableLines(IEnumerable<string> lines)
{
return CodeSampleFileParser.ConcatLines(lines.Where(l => !CodeSampleFileParser.IsCommentOrBlank(l)));
}
protected static void AssertRoundtripCode(string fileName, bool optimize = false, bool useDebug = false, int compilerVersion = 4)
{
var code = RemoveIgnorableLines(File.ReadLines(fileName));
AssemblyDefinition assembly = CompileLegacy(code, optimize, useDebug, compilerVersion);
CSharpDecompiler decompiler = new CSharpDecompiler(assembly.MainModule, new DecompilerSettings());
decompiler.AstTransforms.Insert(0, new RemoveEmbeddedAtttributes());
decompiler.AstTransforms.Insert(0, new RemoveCompilerAttribute());
var syntaxTree = decompiler.DecompileWholeModuleAsSingleFile();
var options = FormattingOptionsFactory.CreateAllman();
options.IndentSwitchBody = false;
CodeAssert.AreEqual(code, syntaxTree.ToString(options));
}
protected static AssemblyDefinition CompileLegacy(string code, bool optimize, bool useDebug, int compilerVersion)
{
CSharpCodeProvider provider = new CSharpCodeProvider(new Dictionary<string, string> { { "CompilerVersion", "v" + new Version(compilerVersion, 0) } });
CompilerParameters options = new CompilerParameters();
options.CompilerOptions = "/unsafe /o" + (optimize ? "+" : "-") + (useDebug ? " /debug" : "");
if (compilerVersion >= 4)
options.ReferencedAssemblies.Add("System.Core.dll");
CompilerResults results = provider.CompileAssemblyFromSource(options, code);
try
{
if (results.Errors.Cast<CompilerError>().Any((arg) => !arg.IsWarning))
{
StringBuilder b = new StringBuilder("Compiler error:");
foreach (var error in results.Errors)
{
b.AppendLine(error.ToString());
}
throw new Exception(b.ToString());
}
return AssemblyDefinition.ReadAssembly(results.PathToAssembly,
new ReaderParameters { InMemory = true });
}
finally
{
File.Delete(results.PathToAssembly);
results.TempFiles.Delete();
}
}
}
}

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

@ -63,6 +63,10 @@ namespace ICSharpCode.Decompiler.Tests.Helpers @@ -63,6 +63,10 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
public static partial class Tester
{
public static readonly string TestCasePath = Path.Combine(
Path.GetDirectoryName(typeof(Tester).Assembly.Location),
"../../../TestCases");
public static string AssembleIL(string sourceFileName, AssemblerOptions options = AssemblerOptions.UseDebug)
{
string ilasmPath = Path.Combine(Environment.GetEnvironmentVariable("windir"), @"Microsoft.NET\Framework\v4.0.30319\ilasm.exe");

8
ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@ -169,11 +169,9 @@ @@ -169,11 +169,9 @@
<Compile Include="Util\BitSetTests.cs" />
<Compile Include="Util\IntervalTests.cs" />
<Compile Include="Util\LongSetTests.cs" />
<Compile Include="CustomAttributes\CustomAttributeTests.cs" />
<Compile Include="CustomAttributes\S_AssemblyCustomAttribute.cs" />
<Compile Include="CustomAttributes\S_CustomAttributeSamples.cs" />
<Compile Include="CustomAttributes\S_CustomAttributes.cs" />
<Compile Include="DecompilerTestBase.cs" />
<Compile Include="TestCases\Pretty\AssemblyCustomAttributes.cs" />
<Compile Include="TestCases\Pretty\CustomAttributeSamples.cs" />
<Compile Include="TestCases\Pretty\CustomAttributes.cs" />
<Compile Include="CodeSampleFileParser.cs" />
</ItemGroup>

2
ICSharpCode.Decompiler.Tests/ILPrettyTestRunner.cs

@ -28,7 +28,7 @@ namespace ICSharpCode.Decompiler.Tests @@ -28,7 +28,7 @@ namespace ICSharpCode.Decompiler.Tests
[TestFixture, Parallelizable(ParallelScope.All)]
public class ILPrettyTestRunner
{
static readonly string TestCasePath = DecompilerTestBase.TestCasePath + "/ILPretty";
static readonly string TestCasePath = Tester.TestCasePath + "/ILPretty";
[Test]
public void AllFilesHaveTests()

20
ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs

@ -29,7 +29,7 @@ namespace ICSharpCode.Decompiler.Tests @@ -29,7 +29,7 @@ namespace ICSharpCode.Decompiler.Tests
[TestFixture, Parallelizable(ParallelScope.All)]
public class PrettyTestRunner
{
static readonly string TestCasePath = DecompilerTestBase.TestCasePath + "/Pretty";
static readonly string TestCasePath = Tester.TestCasePath + "/Pretty";
[Test]
public void AllFilesHaveTests()
@ -308,6 +308,24 @@ namespace ICSharpCode.Decompiler.Tests @@ -308,6 +308,24 @@ namespace ICSharpCode.Decompiler.Tests
RunForLibrary(cscOptions: cscOptions);
}
[Test]
public void AssemblyCustomAttributes([ValueSource(nameof(defaultOptions))] CSharpCompilerOptions cscOptions)
{
RunForLibrary(cscOptions: cscOptions);
}
[Test]
public void CustomAttributes([ValueSource(nameof(defaultOptions))] CSharpCompilerOptions cscOptions)
{
RunForLibrary(cscOptions: cscOptions);
}
[Test]
public void CustomAttributeSamples([ValueSource(nameof(defaultOptions))] CSharpCompilerOptions cscOptions)
{
RunForLibrary(cscOptions: cscOptions);
}
void RunForLibrary([CallerMemberName] string testName = null, AssemblerOptions asmOptions = AssemblerOptions.None, CSharpCompilerOptions cscOptions = CSharpCompilerOptions.None, DecompilerSettings decompilerSettings = null)
{
Run(testName, asmOptions | AssemblerOptions.Library, cscOptions | CSharpCompilerOptions.Library, decompilerSettings);

2
ICSharpCode.Decompiler.Tests/RoundtripAssembly.cs

@ -33,7 +33,7 @@ namespace ICSharpCode.Decompiler.Tests @@ -33,7 +33,7 @@ namespace ICSharpCode.Decompiler.Tests
[TestFixture, Parallelizable(ParallelScope.All)]
public class RoundtripAssembly
{
public static readonly string TestDir = Path.GetFullPath(Path.Combine(DecompilerTestBase.TestCasePath, "../../ILSpy-tests"));
public static readonly string TestDir = Path.GetFullPath(Path.Combine(Tester.TestCasePath, "../../ILSpy-tests"));
static readonly string nunit = Path.Combine(TestDir, "nunit", "nunit3-console.exe");
[Test]

0
ICSharpCode.Decompiler.Tests/CustomAttributes/S_AssemblyCustomAttribute.cs → ICSharpCode.Decompiler.Tests/TestCases/Pretty/AssemblyCustomAttributes.cs

0
ICSharpCode.Decompiler.Tests/CustomAttributes/S_CustomAttributeSamples.cs → ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributeSamples.cs

0
ICSharpCode.Decompiler.Tests/CustomAttributes/S_CustomAttributes.cs → ICSharpCode.Decompiler.Tests/TestCases/Pretty/CustomAttributes.cs

2
ICSharpCode.Decompiler.Tests/UglyTestRunner.cs

@ -29,7 +29,7 @@ namespace ICSharpCode.Decompiler.Tests @@ -29,7 +29,7 @@ namespace ICSharpCode.Decompiler.Tests
[TestFixture, Parallelizable(ParallelScope.All)]
public class UglyTestRunner
{
static readonly string TestCasePath = DecompilerTestBase.TestCasePath + "/Ugly";
static readonly string TestCasePath = Tester.TestCasePath + "/Ugly";
[Test]
public void AllFilesHaveTests()

2
ICSharpCode.Decompiler.Tests/VBPrettyTestRunner.cs

@ -28,7 +28,7 @@ namespace ICSharpCode.Decompiler.Tests @@ -28,7 +28,7 @@ namespace ICSharpCode.Decompiler.Tests
[TestFixture, Parallelizable(ParallelScope.All)]
public class VBPrettyTestRunner
{
static readonly string TestCasePath = DecompilerTestBase.TestCasePath + "/VBPretty";
static readonly string TestCasePath = Tester.TestCasePath + "/VBPretty";
[Test]
public void AllFilesHaveTests()

Loading…
Cancel
Save