Merge pull request #560 from ErikSchierboom/csharp6-nameof-10

C# 6: nameof (part 10)
AutoFixture · Mar 14, 2016 · a14faa0 · a14faa0
2 parents b39eaef + 97e146a
commit a14faa0
Show file tree

Hide file tree

Showing 20 changed files with 62 additions and 62 deletions.
diff --git a/Src/AutoFixture/Kernel/ParameterSpecification.cs b/Src/AutoFixture/Kernel/ParameterSpecification.cs
@@ -41,9 +41,9 @@ private static IEquatable<ParameterInfo> CreateDefaultTarget(
             string targetName)
         {
             if (targetType == null)
-                throw new ArgumentNullException("targetType");
+                throw new ArgumentNullException(nameof(targetType));
             if (targetName == null)
-                throw new ArgumentNullException("targetName");
+                throw new ArgumentNullException(nameof(targetName));
 
             return new ParameterTypeAndNameCriterion(
                 new Criterion<Type>(
@@ -68,7 +68,7 @@ public ParameterSpecification(
             IEquatable<ParameterInfo> target)
         {
             if (target == null)
-                throw new ArgumentNullException("target");
+                throw new ArgumentNullException(nameof(target));
 
             this.target = target;
         }
@@ -104,7 +104,7 @@ public string TargetName
         public bool IsSatisfiedBy(object request)
         {
             if (request == null)
-                throw new ArgumentNullException("request");
+                throw new ArgumentNullException(nameof(request));
 
             var p = request as ParameterInfo;
             if (p == null)

diff --git a/Src/AutoFixture/Kernel/ParameterTypeAndNameCriterion.cs b/Src/AutoFixture/Kernel/ParameterTypeAndNameCriterion.cs
@@ -44,9 +44,9 @@ public ParameterTypeAndNameCriterion(
             IEquatable<string> nameCriterion)
         {
             if (typeCriterion == null)
-                throw new ArgumentNullException("typeCriterion");
+                throw new ArgumentNullException(nameof(typeCriterion));
             if (nameCriterion == null)
-                throw new ArgumentNullException("nameCriterion");
+                throw new ArgumentNullException(nameof(nameCriterion));
 
             this.typeCriterion = typeCriterion;
             this.nameCriterion = nameCriterion;

diff --git a/Src/AutoFixture/Kernel/Postprocessor.cs b/Src/AutoFixture/Kernel/Postprocessor.cs
@@ -168,15 +168,15 @@ public Postprocessor(ISpecimenBuilder builder, Action<T, ISpecimenContext> actio
         {
             if (builder == null)
             {
-                throw new ArgumentNullException("builder");
+                throw new ArgumentNullException(nameof(builder));
             }
             if (action == null)
             {
-                throw new ArgumentNullException("action");
+                throw new ArgumentNullException(nameof(action));
             }
             if (specification == null)
             {
-                throw new ArgumentNullException("specification");
+                throw new ArgumentNullException(nameof(specification));
             }
 
             this.builder = builder;
@@ -208,11 +208,11 @@ public Postprocessor(
             IRequestSpecification specification)
         {
             if (builder == null)
-                throw new ArgumentNullException("builder");
+                throw new ArgumentNullException(nameof(builder));
             if (command == null)
-                throw new ArgumentNullException("command");
+                throw new ArgumentNullException(nameof(command));
             if (specification == null)
-                throw new ArgumentNullException("specification");
+                throw new ArgumentNullException(nameof(specification));
 
             this.builder = builder;
             this.command = command;

diff --git a/Src/AutoFixture/Kernel/PropertyRequestRelay.cs b/Src/AutoFixture/Kernel/PropertyRequestRelay.cs
@@ -23,7 +23,7 @@ public object Create(object request, ISpecimenContext context)
         {
             if (context == null)
             {
-                throw new ArgumentNullException("context");
+                throw new ArgumentNullException(nameof(context));
             }
 
             var propertyInfo = request as PropertyInfo;

diff --git a/Src/AutoFixture/Kernel/PropertySpecification.cs b/Src/AutoFixture/Kernel/PropertySpecification.cs
@@ -42,9 +42,9 @@ private static IEquatable<PropertyInfo> CreateDefaultTarget(
             string targetName)
         {
             if (targetType == null)
-                throw new ArgumentNullException("targetType");
+                throw new ArgumentNullException(nameof(targetType));
             if (targetName == null)
-                throw new ArgumentNullException("targetName");
+                throw new ArgumentNullException(nameof(targetName));
 
             return new PropertyTypeAndNameCriterion(
                 new Criterion<Type>(
@@ -69,7 +69,7 @@ private static IEquatable<PropertyInfo> CreateDefaultTarget(
         public PropertySpecification(IEquatable<PropertyInfo> target)
         {
             if (target == null)
-                throw new ArgumentNullException("target");
+                throw new ArgumentNullException(nameof(target));
 
             this.target = target;
         }
@@ -105,7 +105,7 @@ public string TargetName
         public bool IsSatisfiedBy(object request)
         {
             if (request == null)
-                throw new ArgumentNullException("request");
+                throw new ArgumentNullException(nameof(request));
 
             var p = request as PropertyInfo;
             if (p == null)

diff --git a/Src/AutoFixture/Kernel/PropertyTypeAndNameCriterion.cs b/Src/AutoFixture/Kernel/PropertyTypeAndNameCriterion.cs
@@ -44,9 +44,9 @@ public PropertyTypeAndNameCriterion(
             IEquatable<string> nameCriterion)
         {
             if (typeCriterion == null)
-                throw new ArgumentNullException("typeCriterion");
+                throw new ArgumentNullException(nameof(typeCriterion));
             if (nameCriterion == null)
-                throw new ArgumentNullException("nameCriterion");
+                throw new ArgumentNullException(nameof(nameCriterion));
 
             this.typeCriterion = typeCriterion;
             this.nameCriterion = nameCriterion;

diff --git a/Src/AutoFixture/Kernel/RangedNumberRequest.cs b/Src/AutoFixture/Kernel/RangedNumberRequest.cs
@@ -22,22 +22,22 @@ public RangedNumberRequest(Type operandType, object minimum, object maximum)
         {
             if (operandType == null)
             {
-                throw new ArgumentNullException("operandType");
+                throw new ArgumentNullException(nameof(operandType));
             }
 
             if (minimum == null)
             {
-                throw new ArgumentNullException("minimum");
+                throw new ArgumentNullException(nameof(minimum));
             }
 
             if (maximum == null)
             {
-                throw new ArgumentNullException("maximum");
+                throw new ArgumentNullException(nameof(maximum));
             }
 
             if (((IComparable)minimum).CompareTo((IComparable)maximum) >= 0)
             {
-                throw new ArgumentOutOfRangeException("minimum", "Minimum must be lower than Maximum.");
+                throw new ArgumentOutOfRangeException(nameof(minimum), "Minimum must be lower than Maximum.");
             }
 
             this.operandType = operandType;

diff --git a/Src/AutoFixture/Kernel/RecursionGuard.cs b/Src/AutoFixture/Kernel/RecursionGuard.cs
@@ -93,11 +93,11 @@ public RecursionGuard(ISpecimenBuilder builder, IEqualityComparer comparer)
         {
             if (builder == null)
             {
-                throw new ArgumentNullException("builder");
+                throw new ArgumentNullException(nameof(builder));
             }
             if (comparer == null)
             {
-                throw new ArgumentNullException("comparer");
+                throw new ArgumentNullException(nameof(comparer));
             }
 
             this.builder = builder;
@@ -168,14 +168,14 @@ public RecursionGuard(
             int recursionDepth)
         {
             if (builder == null)
-                throw new ArgumentNullException("builder");
+                throw new ArgumentNullException(nameof(builder));
             if (recursionHandler == null)
-                throw new ArgumentNullException("recursionHandler");
+                throw new ArgumentNullException(nameof(recursionHandler));
             if (comparer == null)
-                throw new ArgumentNullException("comparer");
+                throw new ArgumentNullException(nameof(comparer));
 
             if (recursionDepth < 1)
-                throw new ArgumentOutOfRangeException("recursionDepth", "Recursion depth must be greater than 0.");
+                throw new ArgumentOutOfRangeException(nameof(recursionDepth), "Recursion depth must be greater than 0.");
 
             this.builder = builder;
             this.recursionHandler = recursionHandler;

diff --git a/Src/AutoFixture/Kernel/RegularExpressionRequest.cs b/Src/AutoFixture/Kernel/RegularExpressionRequest.cs
@@ -17,7 +17,7 @@ public RegularExpressionRequest(string pattern)
         {
             if (pattern == null)
             {
-                throw new ArgumentNullException("pattern");
+                throw new ArgumentNullException(nameof(pattern));
             }
 
             this.pattern = pattern;

diff --git a/Src/AutoFixture/Kernel/SeedIgnoringRelay.cs b/Src/AutoFixture/Kernel/SeedIgnoringRelay.cs
@@ -33,7 +33,7 @@ public object Create(object request, ISpecimenContext context)
         {
             if (context == null)
             {
-                throw new ArgumentNullException("context");
+                throw new ArgumentNullException(nameof(context));
             }
 
             var seededRequest = request as SeededRequest;

diff --git a/Src/AutoFixture/Kernel/SeedRequestSpecification.cs b/Src/AutoFixture/Kernel/SeedRequestSpecification.cs
@@ -17,7 +17,7 @@ public SeedRequestSpecification(Type type)
         {
             if (type == null)
             {
-                throw new ArgumentNullException("type");
+                throw new ArgumentNullException(nameof(type));
             }
 
             this.targetType = type;
@@ -43,7 +43,7 @@ public bool IsSatisfiedBy(object request)
         {
             if (request == null)
             {
-                throw new ArgumentNullException("request");
+                throw new ArgumentNullException(nameof(request));
             }
 
             var sr = request as SeededRequest;

diff --git a/Src/AutoFixture/Kernel/SeededFactory.cs b/Src/AutoFixture/Kernel/SeededFactory.cs
@@ -18,7 +18,7 @@ public SeededFactory(Func<T, T> factory)
         {
             if (factory == null)
             {
-                throw new ArgumentNullException("factory");
+                throw new ArgumentNullException(nameof(factory));
             }
 
             this.create = factory;

diff --git a/Src/AutoFixture/Kernel/SeededRequest.cs b/Src/AutoFixture/Kernel/SeededRequest.cs
@@ -19,7 +19,7 @@ public SeededRequest(object request, object seed)
         {
             if (request == null)
             {
-                throw new ArgumentNullException("request");
+                throw new ArgumentNullException(nameof(request));
             }
 
             this.request = request;

diff --git a/Src/AutoFixture/Kernel/SpecifiedNullCommand.cs b/Src/AutoFixture/Kernel/SpecifiedNullCommand.cs
@@ -31,7 +31,7 @@ public SpecifiedNullCommand(Expression<Func<T, TProperty>> propertyPicker)
         {
             if (propertyPicker == null)
             {
-                throw new ArgumentNullException("propertyPicker");
+                throw new ArgumentNullException(nameof(propertyPicker));
             }
 
             this.member = propertyPicker.GetWritableMember().Member;
@@ -67,7 +67,7 @@ public bool IsSatisfiedBy(object request)
         {
             if (request == null)
             {
-                throw new ArgumentNullException("request");
+                throw new ArgumentNullException(nameof(request));
             }
 
             IEqualityComparer comparer = new MemberInfoEqualityComparer();

diff --git a/Src/AutoFixture/Kernel/SpecimenBuilderNode.cs b/Src/AutoFixture/Kernel/SpecimenBuilderNode.cs
@@ -41,9 +41,9 @@ public static class SpecimenBuilderNode
         public static bool GraphEquals(this ISpecimenBuilderNode first, ISpecimenBuilderNode second)
         {
             if (first == null)
-                throw new ArgumentNullException("first");
+                throw new ArgumentNullException(nameof(first));
             if (second == null)
-                throw new ArgumentNullException("second");
+                throw new ArgumentNullException(nameof(second));
 
             return first.GraphEquals(second, EqualityComparer<ISpecimenBuilder>.Default);
         }
@@ -83,11 +83,11 @@ public static bool GraphEquals(this ISpecimenBuilderNode first, ISpecimenBuilder
         public static bool GraphEquals(this ISpecimenBuilderNode first, ISpecimenBuilderNode second, IEqualityComparer<ISpecimenBuilder> comparer)
         {
             if (first == null)
-                throw new ArgumentNullException("first");
+                throw new ArgumentNullException(nameof(first));
             if (second == null)
-                throw new ArgumentNullException("second");
+                throw new ArgumentNullException(nameof(second));
             if (comparer == null)
-                throw new ArgumentNullException("comparer");
+                throw new ArgumentNullException(nameof(comparer));
 
             if (!comparer.Equals(first, second))
                 return false;

diff --git a/Src/AutoFixture/Kernel/SpecimenContext.cs b/Src/AutoFixture/Kernel/SpecimenContext.cs
@@ -18,7 +18,7 @@ public SpecimenContext(ISpecimenBuilder builder)
         {
             if (builder == null)
             {
-                throw new ArgumentNullException("builder");
+                throw new ArgumentNullException(nameof(builder));
             }
 
             this.builder = builder;

diff --git a/Src/AutoFixture/Kernel/SpecimenFactory.cs b/Src/AutoFixture/Kernel/SpecimenFactory.cs
@@ -18,7 +18,7 @@ public SpecimenFactory(Func<T> factory)
         {
             if (factory == null)
             {
-                throw new ArgumentNullException("factory");
+                throw new ArgumentNullException(nameof(factory));
             }
 
             this.create = factory;
@@ -75,7 +75,7 @@ public SpecimenFactory(Func<TInput, T> factory)
         {
             if (factory == null)
             {
-                throw new ArgumentNullException("factory");
+                throw new ArgumentNullException(nameof(factory));
             }
 
             this.create = factory;
@@ -108,7 +108,7 @@ public object Create(object request, ISpecimenContext context)
         {
             if (context == null)
             {
-                throw new ArgumentNullException("context");
+                throw new ArgumentNullException(nameof(context));
             }
 
             var p = (TInput)context.Resolve(typeof(TInput));
@@ -142,7 +142,7 @@ public SpecimenFactory(Func<TInput1, TInput2, T> factory)
         {
             if (factory == null)
             {
-                throw new ArgumentNullException("factory");
+                throw new ArgumentNullException(nameof(factory));
             }
 
             this.create = factory;
@@ -175,7 +175,7 @@ public object Create(object request, ISpecimenContext context)
         {
             if (context == null)
             {
-                throw new ArgumentNullException("context");
+                throw new ArgumentNullException(nameof(context));
             }
 
             var p1 = (TInput1)context.Resolve(typeof(TInput1));
@@ -211,7 +211,7 @@ public SpecimenFactory(Func<TInput1, TInput2, TInput3, T> factory)
         {
             if (factory == null)
             {
-                throw new ArgumentNullException("factory");
+                throw new ArgumentNullException(nameof(factory));
             }
 
             this.create = factory;
@@ -244,7 +244,7 @@ public object Create(object request, ISpecimenContext context)
         {
             if (context == null)
             {
-                throw new ArgumentNullException("context");
+                throw new ArgumentNullException(nameof(context));
             }
 
             var p1 = (TInput1)context.Resolve(typeof(TInput1));
@@ -282,7 +282,7 @@ public SpecimenFactory(Func<TInput1, TInput2, TInput3, TInput4, T> factory)
         {
             if (factory == null)
             {
-                throw new ArgumentNullException("factory");
+                throw new ArgumentNullException(nameof(factory));
             }
 
             this.create = factory;
@@ -315,7 +315,7 @@ public object Create(object request, ISpecimenContext context)
         {
             if (context == null)
             {
-                throw new ArgumentNullException("context");
+                throw new ArgumentNullException(nameof(context));
             }
 
             var p1 = (TInput1)context.Resolve(typeof(TInput1));

diff --git a/Src/AutoFixture/Kernel/StableFiniteSequenceRelay.cs b/Src/AutoFixture/Kernel/StableFiniteSequenceRelay.cs
@@ -40,7 +40,7 @@ public object Create(object request, ISpecimenContext context)
         {
             if (context == null)
             {
-                throw new ArgumentNullException("context");
+                throw new ArgumentNullException(nameof(context));
             }
 
             var manyRequest = request as FiniteSequenceRequest;