Fix StandardConstructorScorer so that it does not fails unit test in …

…some situations
guyzo · Jun 11, 2011 · b47ffc0 · b47ffc0
1 parent ba2cc7e
commit b47ffc0
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/src/Ninject/Selection/Heuristics/StandardConstructorScorer.cs b/src/Ninject/Selection/Heuristics/StandardConstructorScorer.cs
@@ -48,13 +48,10 @@ public int Score(IContext context, ConstructorInjectionDirective directive)
             int score = 1;
             foreach(ITarget target in directive.Targets)
             {
-                foreach(IParameter parameter in context.Parameters)
+                if (ParameterExists(context, target))
                 {
-                    if(string.Equals(target.Name, parameter.Name))
-                    {
-                        score++;
-                        continue;
-                    }
+                    score++;
+                    continue;
                 }
 
                 Type targetType = target.Type;
@@ -63,12 +60,25 @@ public int Score(IContext context, ConstructorInjectionDirective directive)
 
                 if(targetType.IsGenericType && targetType.GetInterfaces().Any(type => type == typeof(IEnumerable)))
                     targetType = targetType.GetGenericArguments()[0];
-
-                if(context.Kernel.GetBindings(targetType).Any())
+
+                if (context.Kernel.GetBindings(targetType).Any())
+                    score++;
+                else
+                {
                     score++;
+                    if (score > 0)
+                    {
+                        score += Int32.MinValue;
+                    }
+                }
             }
 
             return score;
         }
+
+        private static bool ParameterExists(IContext context, ITarget target)
+        {
+            return context.Parameters.Any(parameter => string.Equals(target.Name, parameter.Name));
+        }
     }
 }