Merge pull request #21 from krijesta/attribute-rule

Attributes with inherited properties come up as errors in AttributeArgumentsShouldHaveAccessorsRule

2 files changed, 46 insertions, 4 deletions

diff --git a/gendarme/rules/Gendarme.Rules.Design/AttributeArgumentsShouldHaveAccessorsRule.cs b/gendarme/rules/Gendarme.Rules.Design/AttributeArgumentsShouldHaveAccessorsRule.cs
index b46ac4a8..cc037aa3 100644
--- a/gendarme/rules/Gendarme.Rules.Design/AttributeArgumentsShouldHaveAccessorsRule.cs
+++ b/gendarme/rules/Gendarme.Rules.Design/AttributeArgumentsShouldHaveAccessorsRule.cs
@@ -107,11 +107,18 @@ namespace Gendarme.Rules.Design {
 
 			// look through getters
 			allProperties.Clear ();
-			foreach (PropertyDefinition property in type.Properties) {
-				if (property.GetMethod != null) {
-					allProperties.Add (property.Name);
+
+			TypeDefinition t = type;
+			// Walk up the inheritance tree so that inherited properties are counted
+			do
+			{
+				foreach (PropertyDefinition property in t.Properties) {
+					if (property.GetMethod != null) {
+						allProperties.Add (property.Name);
+					}
 				}
-			}
+				t = t.BaseType != null ? t.BaseType.Resolve () : null;
+			} while (t != null  && !t.IsNamed ("System", "Attribute"));
 
 			// look through parameters
 			foreach (MethodDefinition constructor in type.Methods) {
diff --git a/gendarme/rules/Gendarme.Rules.Design/Test/AttributeArgumentsShouldHaveAccessorsTest.cs b/gendarme/rules/Gendarme.Rules.Design/Test/AttributeArgumentsShouldHaveAccessorsTest.cs
index 06408054..02c92a02 100644
--- a/gendarme/rules/Gendarme.Rules.Design/Test/AttributeArgumentsShouldHaveAccessorsTest.cs
+++ b/gendarme/rules/Gendarme.Rules.Design/Test/AttributeArgumentsShouldHaveAccessorsTest.cs
@@ -196,6 +196,35 @@ namespace Test.Rules.Design {
 		}
 	}
 
+	internal abstract class FooAttribute : Attribute
+	{
+		protected FooAttribute (string foo)
+		{
+			this.Foo = foo;
+		}
+
+		public string Foo
+		{
+			get;
+			private set;
+		}
+	}
+
+	internal class FooBarAttribute : FooAttribute
+	{
+		protected FooBarAttribute (string foo, string bar) : base (foo)
+		{
+			this.Bar = bar;
+		}
+
+		public string Bar
+		{
+			get;
+			private set;
+		}
+	}
+
+
 	[TestFixture]
 	public class AttributeArgumentsShouldHaveAccessorsTest : TypeRuleTestFixture<AttributeArgumentsShouldHaveAccessorsRule> {
 
@@ -252,5 +281,11 @@ namespace Test.Rules.Design {
 		{
 			AssertRuleFailure<TwoAccessorsMissingAttribute> (2);
 		}
+
+		[Test]
+		public void TestInheritedPropertiesAttribute ()
+		{
+			AssertRuleSuccess<FooBarAttribute> ();
+		}
 	}
 }