Method and Ctor Parameters - Ce

juanplopes · May 1, 2012 · 0b08c89 · 0b08c89
1 parent 4393d6e
commit 0b08c89
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 9 deletions.
diff --git a/src/FluentCodeMetrics.Core/CeExtensions.cs b/src/FluentCodeMetrics.Core/CeExtensions.cs
@@ -32,7 +32,17 @@ public static int ComputeCe(this Type that)
                             where method.ReturnType != typeof(void)
                             select method.ReturnType;
 
+    var methodParameterTypes = from method in that.GetMethods(flags)
+                               from parameter in method.GetParameters()
+                               select parameter.ParameterType;
+
+    var ctorParameterTypes = from ctor in that.GetConstructors(flags)
+                             from parameter in ctor.GetParameters()
+                             select parameter.ParameterType;
+
     return new[] { that.BaseType }
+        .Union(ctorParameterTypes)
+        .Union(methodParameterTypes)
         .Union(fieldTypes)
         .Union(propertyTypes)
         .Union(methodReturnTypes)

diff --git a/src/FluentCodeMetrics.Specs/EfferentCoupling.feature b/src/FluentCodeMetrics.Specs/EfferentCoupling.feature
@@ -21,10 +21,10 @@ Funcionalidade: Calcular Acoplamento Eferente (Ce)
 		Exemplos: 
 			| tipo                              | ce |
 			| Samples.EmptyClass                | 5  |
-			| Samples.OneArgCtor                | 6  |
-			| Samples.OneArgVoidMethod          | 6  |
+			| Samples.SingleArgCtor             | 6  |
+			| Samples.SingleArgVoidMethod       | 6  |
 			| Samples.FeeMethod                 | 6  |
-			| Samples.DateTimeArgDateTimeMethod | 7  |
+			| Samples.DateTimeArgDateTimeMethod | 6  |
 			| Samples.SingleProperty            | 6  |
 			| Samples.SingleField               | 6  |
 			| Samples.OneException              | 6  |

diff --git a/src/FluentCodeMetrics.Specs/EfferentCoupling.feature.cs b/src/FluentCodeMetrics.Specs/EfferentCoupling.feature.cs
diff --git a/src/FluentCodeMetrics.Specs/Samples.cs b/src/FluentCodeMetrics.Specs/Samples.cs
@@ -13,15 +13,15 @@ public class EmptyClass
     {
     }
 
-    class OneArgCtor
+    public class SingleArgCtor
     {
 // ReSharper disable UnusedParameter.Local
-        public OneArgCtor(Fee arg)
+        public SingleArgCtor(Fee arg)
 // ReSharper restore UnusedParameter.Local
         {}
     }
 
-    class SingleArgVoidMethod
+    public class SingleArgVoidMethod
     {
          public void Foo(Fee arg)
          {}

diff --git a/src/FluentCodeMetrics.Tests/CeExtensionsTests.cs b/src/FluentCodeMetrics.Tests/CeExtensionsTests.cs
@@ -64,6 +64,34 @@ public void GetReferencedTypes_FeeMethod()
                     typeof(Type)
                 );
         }
+
+        [Test]
+        public void GetReferencedTypes_SingleArgVoidMethod()
+        {
+            typeof(SingleArgVoidMethod).GetReferencedTypes()
+                .Should().Have.SameSequenceAs(
+                    typeof(object),
+                    typeof(Fee), // argument type
+                    typeof(string),
+                    typeof(bool),
+                    typeof(int),
+                    typeof(Type)
+                );
+        }
+
+        [Test]
+        public void GetReferencedTypes_SingleArgCtor()
+        {
+            typeof(SingleArgCtor).GetReferencedTypes()
+                .Should().Have.SameSequenceAs(
+                    typeof(object),
+                    typeof(Fee), // argument type
+                    typeof(string),
+                    typeof(bool),
+                    typeof(int),
+                    typeof(Type)
+                );
+        }
     }
     // ReSharper restore InconsistentNaming
 }