Author: spouliot
Date: 2007-12-21 18:38:50 -0500 (Fri, 21 Dec 2007)
New Revision: 91799
Modified:
trunk/cecil/gendarme/rules/Gendarme.Rules.Performance/Test/AvoidUncalledPrivateCodeTest.cs
trunk/cecil/gendarme/rules/Gendarme.Rules.Performance/Test/AvoidUnusedParametersTest.cs
trunk/cecil/gendarme/rules/Gendarme.Rules.Performance/Test/ChangeLog
Log:
2007-12-21 Sebastien Pouliot <[EMAIL PROTECTED]>
* AvoidUncalledPrivateCodeTest.cs, AvoidUnusedParametersTest.cs:
Fix anonymous test cases since GMCS and CSC don't compile the types,
or methods, using the same names.
Modified:
trunk/cecil/gendarme/rules/Gendarme.Rules.Performance/Test/AvoidUncalledPrivateCodeTest.cs
===================================================================
---
trunk/cecil/gendarme/rules/Gendarme.Rules.Performance/Test/AvoidUncalledPrivateCodeTest.cs
2007-12-21 22:58:18 UTC (rev 91798)
+++
trunk/cecil/gendarme/rules/Gendarme.Rules.Performance/Test/AvoidUncalledPrivateCodeTest.cs
2007-12-21 23:38:50 UTC (rev 91799)
@@ -568,9 +568,23 @@
[Test]
public void AnonymousMethodTest ()
{
+ // compiler generated code is compiler dependant, check
for [g]mcs (inner type)
type = GetTest
("AnonymousMethod/<>c__CompilerGenerated0");
- foreach (MethodDefinition method in type.Methods)
- Assert.IsNull (methodRule.CheckMethod (method,
new MinimalRunner ()));
+ // otherwise try for csc (inside same class)
+ if (type == null)
+ type = GetTest ("AnonymousMethod");
+
+ Assert.IsNotNull (type, "type not found");
+ foreach (MethodDefinition method in type.Methods) {
+ switch (method.Name) {
+ case "MethodWithAnonymousMethod":
+ // this isn't part of the test (but
included with CSC)
+ break;
+ default:
+ Assert.IsNull (methodRule.CheckMethod
(method, new MinimalRunner ()));
+ break;
+ }
+ }
}
}
}
Modified:
trunk/cecil/gendarme/rules/Gendarme.Rules.Performance/Test/AvoidUnusedParametersTest.cs
===================================================================
---
trunk/cecil/gendarme/rules/Gendarme.Rules.Performance/Test/AvoidUnusedParametersTest.cs
2007-12-21 22:58:18 UTC (rev 91798)
+++
trunk/cecil/gendarme/rules/Gendarme.Rules.Performance/Test/AvoidUnusedParametersTest.cs
2007-12-21 23:38:50 UTC (rev 91799)
@@ -262,9 +262,20 @@
[Test]
public void AnonymousMethodTest ()
{
+ // compiler generated code is compiler dependant, check
for [g]mcs (inner type)
method = GetMethodForTestFrom
("Test.Rules.Performance.AvoidUnusedParametersTest/<>c__CompilerGenerated0",
"<AnonymousMethodWithUnusedParameters>c__2");
- messageCollection = rule.CheckMethod (method, new
MinimalRunner ());
- Assert.IsNull (messageCollection);
+ // otherwise try for csc (inside same class)
+ if (method == null) {
+ TypeDefinition type = assembly.MainModule.Types
["Test.Rules.Performance.AvoidUnusedParametersTest"];
+ foreach (MethodDefinition md in type.Methods) {
+ if (md.Name.StartsWith
("<AnonymousMethodWithUnusedParameters>")) {
+ method = md;
+ break;
+ }
+ }
+ }
+ Assert.IsNotNull (method, "method not found!");
+ Assert.IsNull (rule.CheckMethod (method, new
MinimalRunner ()), "rule result");
}
[Test]
Modified: trunk/cecil/gendarme/rules/Gendarme.Rules.Performance/Test/ChangeLog
===================================================================
--- trunk/cecil/gendarme/rules/Gendarme.Rules.Performance/Test/ChangeLog
2007-12-21 22:58:18 UTC (rev 91798)
+++ trunk/cecil/gendarme/rules/Gendarme.Rules.Performance/Test/ChangeLog
2007-12-21 23:38:50 UTC (rev 91799)
@@ -1,3 +1,9 @@
+2007-12-21 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * AvoidUncalledPrivateCodeTest.cs, AvoidUnusedParametersTest.cs:
+ Fix anonymous test cases since GMCS and CSC don't compile the types,
+ or methods, using the same names.
+
2007-12-21 Nestor Salceda <[EMAIL PROTECTED]>
* AvoidUnusedParametersTest.cs: Added a testcase for anonymous methods
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches