Refactoring enum parsing to not fail and instead return a default value if parsing fails

Author: dontjee

RestSharp.Tests/JsonTests.cs

@@ -256,12 +256,13 @@ public void Can_Deserialize_Various_Enum_Values ()
 		}
 
 		[Fact]
-		public void Deserialization_Of_Undefined_Int_Value_Still_Throws_InvalidOperationException()
+		public void Deserialization_Of_Undefined_Int_Value_Returns_Enum_Default()
 		{
 			const string data = @"{ ""Integer"" : 1024 }";
 			var response = new RestResponse { Content = data };
 			var json = new JsonDeserializer ();
-			Assert.Throws<InvalidOperationException>(() => json.Deserialize<JsonEnumsTestStructure>(response));
+			var result = json.Deserialize<JsonEnumsTestStructure>(response);
+			Assert.Equal(Disposition.Friendly,result.Integer);
 		}
 
 		[Fact]

RestSharp/Extensions/ReflectionExtensions.cs

@@ -92,22 +92,20 @@ public static object ChangeType(this object source, Type newType, CultureInfo cu
 		public static object FindEnumValue(this Type type, string value, CultureInfo culture)
 		{
 #if FRAMEWORK
-			var enumValues = Enum.GetValues( type ).Cast<Enum>().ToList();
-			try
-			{
-				return enumValues
-				.First(v => v.ToString().GetNameVariants(culture).Contains(value, StringComparer.Create(culture, true)));
-			}
-			catch (InvalidOperationException)
+			var ret = Enum.GetValues( type )
+			.Cast<Enum>()
+			.FirstOrDefault( v => v.ToString().GetNameVariants( culture ).Contains( value, StringComparer.Create( culture, true ) ) );
+
+			if ( ret == null )
 			{
 				int enumValueAsInt;
-				if(int.TryParse( value, out enumValueAsInt ) && Enum.IsDefined(type, enumValueAsInt))
+				if ( Int32.TryParse( value, out enumValueAsInt ) && Enum.IsDefined( type, enumValueAsInt ) )
 				{
-					return enumValues
-					.First(v => Convert.ToInt32(v) == enumValueAsInt);
-				}
-				throw;
+					ret = (Enum) Enum.ToObject( type, enumValueAsInt );
+            }
 			}
+
+			return ret;
 #else
 			return Enum.Parse(type, value, true);
 #endif