From 67124b3b9d0d9810fa5209f3201f8281556a3c2c Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 24 Feb 2019 21:26:18 +0100 Subject: [PATCH] Adjust tests to sorted top-level-types. --- .../TestCases/ILPretty/FSharpLoops_Debug.cs | 5 +- .../TestCases/ILPretty/FSharpLoops_Release.cs | 4 +- .../TestCases/ILPretty/Issue1325.cs | 47 +++++++++---------- .../Ugly/NoArrayInitializers.Expected.cs | 20 ++++---- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/FSharpLoops_Debug.cs b/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/FSharpLoops_Debug.cs index fc7857261..9f4c8ad77 100644 --- a/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/FSharpLoops_Debug.cs +++ b/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/FSharpLoops_Debug.cs @@ -1,4 +1,3 @@ - // C:\Users\Siegfried\Documents\Visual Studio 2017\Projects\ConsoleApp13\ConsoleApplication1\bin\Debug\ConsoleApplication1.exe // ConsoleApplication1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null // Global type: @@ -170,10 +169,10 @@ public static class Program } namespace _003CStartupCode_0024ConsoleApplication1_003E { - internal static class _0024Program + internal static class _0024AssemblyInfo { } - internal static class _0024AssemblyInfo + internal static class _0024Program { } } diff --git a/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/FSharpLoops_Release.cs b/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/FSharpLoops_Release.cs index 39907241d..495722a13 100644 --- a/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/FSharpLoops_Release.cs +++ b/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/FSharpLoops_Release.cs @@ -172,10 +172,10 @@ public static class Program } namespace _003CStartupCode_0024ConsoleApplication1_003E { - internal static class _0024Program + internal static class _0024AssemblyInfo { } - internal static class _0024AssemblyInfo + internal static class _0024Program { } } diff --git a/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue1325.cs b/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue1325.cs index 5372e37be..daa5be110 100644 --- a/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue1325.cs +++ b/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue1325.cs @@ -12,16 +12,7 @@ using System.Runtime.Versioning; [assembly: TargetFramework(".NETCoreApp,Version=v2.1", FrameworkDisplayName = "")] [assembly: AssemblyConfiguration("Debug")] [assembly: AssemblyFileVersion("1.0.0.0")] -namespace Microsoft.VisualBasic -{ - [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Module | AttributeTargets.Class, Inherited = false)] - [CompilerGenerated] - [EditorBrowsable(EditorBrowsableState.Never)] - [Embedded] - internal sealed class Embedded : Attribute - { - } -} + namespace Issue1325 { [StandardModule] @@ -40,19 +31,7 @@ namespace Issue1325 t.Unparameterized = str + "asdf"; } } -} -namespace Microsoft.VisualBasic.CompilerServices -{ - [EditorBrowsable(EditorBrowsableState.Never)] - [AttributeUsage(AttributeTargets.Class, Inherited = false)] - [CompilerGenerated] - [Embedded] - internal sealed class StandardModuleAttribute : Attribute - { - } -} -namespace Issue1325 -{ + internal class Test { [DebuggerBrowsable(DebuggerBrowsableState.Never)] @@ -71,4 +50,24 @@ namespace Issue1325 set; } } -} \ No newline at end of file +} +namespace Microsoft.VisualBasic +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Module | AttributeTargets.Class, Inherited = false)] + [CompilerGenerated] + [EditorBrowsable(EditorBrowsableState.Never)] + [Embedded] + internal sealed class Embedded : Attribute + { + } +} +namespace Microsoft.VisualBasic.CompilerServices +{ + [EditorBrowsable(EditorBrowsableState.Never)] + [AttributeUsage(AttributeTargets.Class, Inherited = false)] + [CompilerGenerated] + [Embedded] + internal sealed class StandardModuleAttribute : Attribute + { + } +} diff --git a/ICSharpCode.Decompiler.Tests/TestCases/Ugly/NoArrayInitializers.Expected.cs b/ICSharpCode.Decompiler.Tests/TestCases/Ugly/NoArrayInitializers.Expected.cs index b798da8fc..81196e6f1 100644 --- a/ICSharpCode.Decompiler.Tests/TestCases/Ugly/NoArrayInitializers.Expected.cs +++ b/ICSharpCode.Decompiler.Tests/TestCases/Ugly/NoArrayInitializers.Expected.cs @@ -1,6 +1,17 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; + +[CompilerGenerated] +internal sealed class _003CPrivateImplementationDetails_003E +{ + [StructLayout(LayoutKind.Explicit, Pack = 1, Size = 12)] + private struct __StaticArrayInitTypeSize_003D12 + { + } + internal static readonly __StaticArrayInitTypeSize_003D12 E429CCA3F703A39CC5954A6572FEC9086135B34E/* Not supported: data(01 00 00 00 02 00 00 00 03 00 00 00) */; +} + namespace ICSharpCode.Decompiler.Tests.TestCases.Ugly { public class NoArrayInitializers @@ -21,12 +32,3 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Ugly } } } -[CompilerGenerated] -internal sealed class _003CPrivateImplementationDetails_003E -{ - [StructLayout(LayoutKind.Explicit, Pack = 1, Size = 12)] - private struct __StaticArrayInitTypeSize_003D12 - { - } - internal static readonly __StaticArrayInitTypeSize_003D12 E429CCA3F703A39CC5954A6572FEC9086135B34E/* Not supported: data(01 00 00 00 02 00 00 00 03 00 00 00) */; -} \ No newline at end of file