Introduce property.Can{Read,Write} extension methods

devlooped · Oct 19, 2019 · 4d64fce · 4d64fce
1 parent dd2578a
commit 4d64fce
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/src/Moq/Extensions.cs b/src/Moq/Extensions.cs
@@ -19,6 +19,36 @@ public static bool CanCreateInstance(this Type type)
 			return type.IsValueType || type.GetConstructor(Type.EmptyTypes) != null;
 		}
 
+		public static bool CanRead(this PropertyInfo property, out MethodInfo getter)
+		{
+			if (property.CanRead)
+			{
+				getter = property.GetGetMethod(nonPublic: true);
+				Debug.Assert(getter != null);
+				return true;
+			}
+			else
+			{
+				getter = null;
+				return false;
+			}
+		}
+
+		public static bool CanWrite(this PropertyInfo property, out MethodInfo setter)
+		{
+			if (property.CanWrite)
+			{
+				setter = property.GetSetMethod(nonPublic: true);
+				Debug.Assert(setter != null);
+				return true;
+			}
+			else
+			{
+				setter = null;
+				return false;
+			}
+		}
+
 		/// <summary>
 		///   Gets the default value for the specified type. This is the Reflection counterpart of C#'s <see langword="default"/> operator.
 		/// </summary>

diff --git a/src/Moq/Interception/InterceptionAspects.cs b/src/Moq/Interception/InterceptionAspects.cs
@@ -314,9 +314,8 @@ public static bool Handle(Invocation invocation, Mock mock)
 				object propertyValue;
 
 				Setup getterSetup = null;
-				if (property.CanRead)
+				if (property.CanRead(out var getter))
 				{
-					var getter = property.GetGetMethod(true);
 					if (ProxyFactory.Instance.IsMethodVisible(getter, out _))
 					{
 						propertyValue = CreateInitialPropertyValue(mock, getter);
@@ -336,9 +335,8 @@ public static bool Handle(Invocation invocation, Mock mock)
 				}
 
 				Setup setterSetup = null;
-				if (property.CanWrite)
+				if (property.CanWrite(out var setter))
 				{
-					MethodInfo setter = property.GetSetMethod(nonPublic: true);
 					if (ProxyFactory.Instance.IsMethodVisible(setter, out _))
 					{
 						setterSetup = new AutoImplementedPropertySetterSetup(expression, setter, (newValue) =>