ControlFlow test case

ICSharpCode.Decompiler/Tests/ControlFlow.cs

@@ -1,81 +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.Collections.Generic;
-
-public static class ControlFlow
-{
-	public static void EmptyIf(string input, List<string> value, Dictionary<int, string> _headers)
-	{
-		if (value.Contains("test"))
-		{
-		}
-		_headers.Add(2, "result");
-	}
-	
-	public static void NormalIf(string input, List<string> value, Dictionary<int, string> _headers)
-	{
-		if (value.Contains("test"))
-		{
-			_headers.Add(1, "result");
-		}
-		else
-		{
-			_headers.Add(1, "else");
-		}
-		_headers.Add(2, "end");
-	}
-	
-	public static void NormalIf2(string input, List<string> value, Dictionary<int, string> _headers)
-	{
-		if (value.Contains("test"))
-		{
-			_headers.Add(1, "result");
-		}
-		_headers.Add(2, "end");
-	}
-	
-	public static void NormalIf3(string input, List<string> value, Dictionary<int, string> _headers)
-	{
-		if (value.Contains("test"))
-		{
-			_headers.Add(1, "result");
-		}
-		else
-		{
-			_headers.Add(1, "else");
-		}
-	}
-	
-	public static void Test(string input, List<string> value, Dictionary<int, string> _headers)
-	{
-		foreach (string current in value)
-		{
-			_headers.Add(0, current);
-		}
-		if (value.Contains("test"))
-		{
-			_headers.Add(1, "result");
-		}
-		else
-		{
-			_headers.Add(1, "else");
-		}
-	}
-}

ICSharpCode.Decompiler/Tests/Helpers/Tester.cs

@@ -13,14 +13,22 @@ using Mono.Cecil;
 
 namespace ICSharpCode.Decompiler.Tests.Helpers
 {
+	[Flags]
+	public enum CompilerOptions
+	{
+		None,
+		Optimize,
+		UseDebug
+	}
+
 	public static class Tester
 	{
-		public static string CompileCSharp(string sourceFileName, bool optimize = false, bool useDebug = true)
+		public static string CompileCSharp(string sourceFileName, CompilerOptions flags = CompilerOptions.UseDebug)
 		{
 			CSharpCodeProvider provider = new CSharpCodeProvider(new Dictionary<string, string> { { "CompilerVersion", "v4.0" } });
 			CompilerParameters options = new CompilerParameters();
 			options.GenerateExecutable = true;
-			options.CompilerOptions = "/unsafe /o" + (optimize ? "+" : "-") + (useDebug ? " /debug" : "");
+			options.CompilerOptions = "/unsafe /o" + (flags.HasFlag(CompilerOptions.Optimize) ? "+" : "-") + (flags.HasFlag(CompilerOptions.UseDebug) ? " /debug" : "");
 			options.ReferencedAssemblies.Add("System.Core.dll");
 			CompilerResults results = provider.CompileAssemblyFromFile(options, sourceFileName);
 			if (results.Errors.Count > 0) {

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

@@ -91,6 +91,7 @@
     <Compile Include="Helpers\CodeAssert.cs" />
     <Compile Include="Helpers\RemoveCompilerAttribute.cs" />
     <Compile Include="Helpers\Tester.cs" />
+    <Compile Include="TestCases\ControlFlow.cs" />
     <Compile Include="TestCases\HelloWorld.cs" />
     <Compile Include="TestRunner.cs" />
   </ItemGroup>

ICSharpCode.Decompiler/Tests/TestCases/ControlFlow.cs

@@ -0,0 +1,90 @@
+// 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.Collections.Generic;
+
+class ControlFlow
+{
+	public static int Main()
+	{
+		int result = 0;
+		EmptyIf("Empty", ref result);
+		EmptyIf("test", ref result);
+		NormalIf("none", ref result);
+		NormalIf("test", ref result);
+		NormalIf2("none", ref result);
+		NormalIf2("test", ref result);
+		NormalIf3("none", ref result);
+		NormalIf3("test", ref result);
+		Test("none", ref result);
+		Test("test", ref result);
+		return result;
+	}
+
+	static void EmptyIf(string input, ref int result)
+	{
+		if (input.Contains("test")) {
+		}
+		result++;
+		Console.WriteLine("EmptyIf");
+	}
+
+	static void NormalIf(string input, ref int result)
+	{
+		if (input.Contains("test")) {
+			Console.WriteLine("result");
+		} else {
+			Console.WriteLine("else");
+		}
+		result++;
+		Console.WriteLine("end");
+	}
+
+	static void NormalIf2(string input, ref int result)
+	{
+		if (input.Contains("test")) {
+			Console.WriteLine("result");
+		}
+		result++;
+		Console.WriteLine("end");
+	}
+
+	static void NormalIf3(string input, ref int result)
+	{
+		if (input.Contains("test")) {
+			Console.WriteLine("result");
+		} else {
+			Console.WriteLine("else");
+		}
+		result++;
+	}
+
+	static void Test(string input, ref int result)
+	{
+		foreach (char c in input) {
+			Console.Write(c);
+			result++;
+		}
+		if (input.Contains("test")) {
+			Console.WriteLine("result");
+		} else {
+			Console.WriteLine("else");
+		}
+	}
+}

ICSharpCode.Decompiler/Tests/TestCases/HelloWorld.cs

@@ -1,4 +1,22 @@
-using System;
+// 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;
 
 namespace HelloWorld
 {

ICSharpCode.Decompiler/Tests/TestRunner.cs

@@ -33,23 +33,29 @@ namespace ICSharpCode.Decompiler.Tests
 			TestCompileDecompileCompileOutputAll("HelloWorld.cs");
 		}
 
+		[Test]
+		public void ControlFlow()
+		{
+			TestCompileDecompileCompileOutputAll("ControlFlow.cs");
+		}
+
 		void TestCompileDecompileCompileOutputAll(string testFileName)
 		{
-			TestCompileDecompileCompileOutput(testFileName, optimize: false, useDebug: true);
-			TestCompileDecompileCompileOutput(testFileName, optimize: false, useDebug: false);
-			TestCompileDecompileCompileOutput(testFileName, optimize: true, useDebug: true);
-			TestCompileDecompileCompileOutput(testFileName, optimize: true, useDebug: false);
+			TestCompileDecompileCompileOutput(testFileName, CompilerOptions.None);
+			TestCompileDecompileCompileOutput(testFileName, CompilerOptions.UseDebug);
+			TestCompileDecompileCompileOutput(testFileName, CompilerOptions.Optimize);
+			TestCompileDecompileCompileOutput(testFileName, CompilerOptions.UseDebug | CompilerOptions.Optimize);
 		}
 
-		void TestCompileDecompileCompileOutput(string testFileName, bool optimize = false, bool useDebug = true)
+		void TestCompileDecompileCompileOutput(string testFileName, CompilerOptions options = CompilerOptions.UseDebug)
 		{
 			string outputFile = null, decompiledOutputFile = null;
 			string output1, output2, error1, error2;
 
 			try {
-				outputFile = Tester.CompileCSharp(Path.Combine(TestCasePath, "HelloWorld.cs"), optimize, useDebug);
+				outputFile = Tester.CompileCSharp(Path.Combine(TestCasePath, testFileName), options);
 				string decompiledCodeFile = Tester.DecompileCSharp(outputFile);
-				decompiledOutputFile = Tester.CompileCSharp(decompiledCodeFile, optimize, useDebug);
+				decompiledOutputFile = Tester.CompileCSharp(decompiledCodeFile, options);
 				int result1 = Tester.Run(outputFile, out output1, out error1);
 				int result2 = Tester.Run(decompiledOutputFile, out output2, out error2);