Browse Source

Fix unit tests

pull/1087/head
Siegfried Pammer 8 years ago
parent
commit
a957163aa3
  1. 1
      ICSharpCode.Decompiler.Tests/Helpers/Tester.cs
  2. 10
      ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs
  3. 8
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/ExpressionTrees.cs
  4. 12
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/NullPropagation.cs
  5. 4
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/UnsafeCode.cs

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

@ -302,6 +302,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers @@ -302,6 +302,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
// disable C# features not available in legacy compiler
settings.NullPropagation = false;
settings.StringInterpolation = false;
settings.UseExpressionBodyForCalculatedGetterOnlyProperties = false;
}
return settings;
}

10
ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs

@ -255,17 +255,17 @@ namespace ICSharpCode.Decompiler.Tests @@ -255,17 +255,17 @@ namespace ICSharpCode.Decompiler.Tests
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);
}
[Test]
public void CS6_StringInterpolation([ValueSource("roslynOnlyOptions")] CSharpCompilerOptions cscOptions)
{
Run(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);
}
void Run([CallerMemberName] string testName = null, AssemblerOptions asmOptions = AssemblerOptions.None, CSharpCompilerOptions cscOptions = CSharpCompilerOptions.None, DecompilerSettings decompilerSettings = null)
{
var ilFile = Path.Combine(TestCasePath, testName) + Tester.GetSuffix(cscOptions) + ".il";

8
ICSharpCode.Decompiler.Tests/TestCases/Pretty/ExpressionTrees.cs

@ -699,22 +699,30 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty @@ -699,22 +699,30 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
public int Field = 3;
#if LEGACY_CSC
public static int StaticReadonlyProperty {
get {
return 0;
}
}
#else
public static int StaticReadonlyProperty => 0;
#endif
public static int StaticProperty {
get;
set;
}
#if LEGACY_CSC
public int ReadonlyProperty {
get {
return 0;
}
}
#else
public int ReadonlyProperty => 0;
#endif
public int Property {
get;

12
ICSharpCode.Decompiler.Tests/TestCases/Pretty/NullPropagation.cs

@ -32,16 +32,8 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty @@ -32,16 +32,8 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
{
public int IntVal;
public MyClass Field;
public MyStruct? Property1 {
get {
return null;
}
}
public MyStruct Property2 {
get {
return default(MyStruct);
}
}
public MyStruct? Property1 => null;
public MyStruct Property2 => default(MyStruct);
public MyStruct? this[int index] {
get {
return null;

4
ICSharpCode.Decompiler.Tests/TestCases/Pretty/UnsafeCode.cs

@ -58,11 +58,15 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty @@ -58,11 +58,15 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
private UnsafeDelegate unsafeDelegate;
private static UnsafeDelegate staticUnsafeDelegate;
#if LEGACY_CSC
public unsafe int* NullPointer {
get {
return null;
}
}
#else
public unsafe int* NullPointer => null;
#endif
unsafe static UnsafeCode()
{

Loading…
Cancel
Save