Mirror
/
icsharpcode-ILSpy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Activate Loops unit test. (Some test cases are still ignored.)

pull/870/merge
Siegfried Pammer 8 years ago
parent
0691aee363
commit
718fae11de
2 changed files with 108 additions and 122 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs
  2. 228
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/Loops.cs

2
ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs
View File

@ -131,7 +131,7 @@ namespace ICSharpCode.Decompiler.Tests
} }
} }
[Test, Ignore("Bad variable names; some if-else misdetected")]
[Test]
public void Loops([ValueSource("defaultOptions")] CompilerOptions cscOptions) public void Loops([ValueSource("defaultOptions")] CompilerOptions cscOptions)
{ {
Run(cscOptions: cscOptions); Run(cscOptions: cscOptions);

228
ICSharpCode.Decompiler.Tests/TestCases/Pretty/Loops.cs
View File

@ -26,30 +26,37 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
{ {
public void ForEach(IEnumerable<string> enumerable) public void ForEach(IEnumerable<string> enumerable)
{ {
foreach (string current in enumerable) {
current.ToLower();
foreach (string item in enumerable) {
item.ToLower();
} }
} }
public void ForEachOverList(List<string> list) public void ForEachOverList(List<string> list)
{ {
// List has a struct as enumerator, so produces quite different IL than foreach over the IEnumerable interface // List has a struct as enumerator, so produces quite different IL than foreach over the IEnumerable interface
foreach (string current in list) {
current.ToLower();
foreach (string item in list) {
item.ToLower();
} }
} }
public void ForEachOverNonGenericEnumerable(IEnumerable enumerable) public void ForEachOverNonGenericEnumerable(IEnumerable enumerable)
{ {
foreach (object current in enumerable) {
current.ToString();
foreach (object item in enumerable) {
item.ToString();
} }
} }
public void ForEachOverNonGenericEnumerableWithAutomaticCast(IEnumerable enumerable)
public void ForEachOverNonGenericEnumerableWithAutomaticCastValueType(IEnumerable enumerable)
{ {
foreach (int num in enumerable) {
num.ToString();
foreach (int item in enumerable) {
item.ToString();
}
}
public void ForEachOverNonGenericEnumerableWithAutomaticCastRefType(IEnumerable enumerable)
{
foreach (string item in enumerable) {
Console.WriteLine(item);
} }
} }
@ -81,46 +88,46 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
} }
} }
public int MultipleExits()
{
int i = 0;
while (true) {
if (i % 4 == 0) { return 4; }
if (i % 7 == 0) { break; }
if (i % 9 == 0) { return 5; }
if (i % 11 == 0) { break; }
i++;
}
i = int.MinValue;
return i;
}
public int InterestingLoop()
{
int i = 0;
if (i % 11 == 0) {
while (true) {
if (i % 4 == 0) {
if (i % 7 == 0) {
if (i % 11 == 0) {
continue; // use a continue here to prevent moving the if (i%7) outside the loop
}
Console.WriteLine("7");
} else {
// this block is not part of the natural loop
Console.WriteLine("!7");
}
break;
}
i++;
}
// This instruction is still dominated by the loop header
i = int.MinValue;
}
return i;
}
//public int MultipleExits()
//{
// int i = 0;
// while (true) {
// if (i % 4 == 0) { return 4; }
// if (i % 7 == 0) { break; }
// if (i % 9 == 0) { return 5; }
// if (i % 11 == 0) { break; }
// i++;
// }
// i = int.MinValue;
// return i;
//}
//public int InterestingLoop()
//{
// int i = 0;
// if (i % 11 == 0) {
// while (true) {
// if (i % 4 == 0) {
// if (i % 7 == 0) {
// if (i % 11 == 0) {
// continue; // use a continue here to prevent moving the if (i%7) outside the loop
// }
// Console.WriteLine("7");
// } else {
// // this block is not part of the natural loop
// Console.WriteLine("!7");
// }
// break;
// }
// i++;
// }
// // This instruction is still dominated by the loop header
// i = int.MinValue;
// }
// return i;
//}
bool Condition(string arg)
private bool Condition(string arg)
{ {
Console.WriteLine("Condition: " + arg); Console.WriteLine("Condition: " + arg);
return false; return false;
@ -129,13 +136,14 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
public void WhileLoop() public void WhileLoop()
{ {
Console.WriteLine("Initial"); Console.WriteLine("Initial");
if (Condition("if")) {
while (Condition("while")) {
if (this.Condition("if")) {
while (this.Condition("while")) {
Console.WriteLine("Loop Body"); Console.WriteLine("Loop Body");
if (Condition("test")) {
if (Condition("continue"))
if (this.Condition("test")) {
if (this.Condition("continue")) {
continue; continue;
if (!Condition("break"))
}
if (!this.Condition("break"))
break; break;
} }
Console.WriteLine("End of loop body"); Console.WriteLine("End of loop body");
@ -145,50 +153,52 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
Console.WriteLine("End of method"); Console.WriteLine("End of method");
} }
public void WhileWithGoto()
{
while (Condition("Main Loop")) {
if (!Condition("Condition"))
goto block2;
block1:
Console.WriteLine("Block1");
if (Condition("Condition2"))
continue;
block2:
Console.WriteLine("Block2");
goto block1;
}
}
public void DoWhileLoop()
{
Console.WriteLine("Initial");
if (Condition("if")) {
do {
Console.WriteLine("Loop Body");
if (Condition("test")) {
if (Condition("continue"))
continue;
if (!Condition("break"))
break;
}
Console.WriteLine("End of loop body");
} while (Condition("while"));
Console.WriteLine("After loop");
}
Console.WriteLine("End of method");
}
//public void WhileWithGoto()
//{
// while (this.Condition("Main Loop")) {
// if (!this.Condition("Condition"))
// goto block2;
// block1:
// Console.WriteLine("Block1");
// if (this.Condition("Condition2"))
// continue;
// block2:
// Console.WriteLine("Block2");
// goto block1;
// }
//}
//public void DoWhileLoop()
//{
// Console.WriteLine("Initial");
// if (this.Condition("if")) {
// do {
// Console.WriteLine("Loop Body");
// if (this.Condition("test")) {
// if (this.Condition("continue")) {
// continue;
// }
// if (!this.Condition("break"))
// break;
// }
// Console.WriteLine("End of loop body");
// } while (this.Condition("while"));
// Console.WriteLine("After loop");
// }
// Console.WriteLine("End of method");
//}
public void ForLoop() public void ForLoop()
{ {
Console.WriteLine("Initial"); Console.WriteLine("Initial");
if (Condition("if")) {
for (int i = 0; Condition("for"); i++) {
if (this.Condition("if")) {
for (int i = 0; this.Condition("for"); i++) {
Console.WriteLine("Loop Body"); Console.WriteLine("Loop Body");
if (Condition("test")) {
if (Condition("continue"))
if (this.Condition("test")) {
if (this.Condition("continue")) {
continue; continue;
if (!Condition("not-break"))
}
if (!this.Condition("not-break"))
break; break;
} }
Console.WriteLine("End of loop body"); Console.WriteLine("End of loop body");
@ -198,41 +208,17 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
Console.WriteLine("End of method"); Console.WriteLine("End of method");
} }
public void DoubleForEachWithSameVariable(IEnumerable<string> enumerable)
{
foreach (string current in enumerable) {
current.ToLower();
}
foreach (string current in enumerable) {
current.ToLower();
}
}
static void ForeachExceptForNameCollision(IEnumerable<int> inputs)
{
Console.WriteLine("ForeachWithNameCollision");
int input;
using (var enumerator = inputs.GetEnumerator()) {
while (enumerator.MoveNext()) {
input = enumerator.Current;
Console.WriteLine(input);
}
}
input = 1;
Console.WriteLine(input);
}
static void ForeachExceptForContinuedUse(IEnumerable<int> inputs)
public static void ForeachExceptForContinuedUse(IEnumerable<int> inputs)
{ {
Console.WriteLine("ForeachExceptForContinuedUse"); Console.WriteLine("ForeachExceptForContinuedUse");
int input = 0;
using (var enumerator = inputs.GetEnumerator()) {
int num = 0;
using (IEnumerator<int> enumerator = inputs.GetEnumerator()) {
while (enumerator.MoveNext()) { while (enumerator.MoveNext()) {
input = enumerator.Current;
Console.WriteLine(input);
num = enumerator.Current;
Console.WriteLine(num);
} }
} }
Console.WriteLine("Last: " + input);
Console.WriteLine("Last: " + num);
} }
} }
} }
Write Preview
Loading…
Cancel
Save