Add more tests

Author: timotei

RestSharp.Tests/Extensions/RSACryptoServiceProviderExtensionsTests.cs

@@ -1,4 +1,5 @@
-using System.Security.Cryptography;
+using System;
+using System.Security.Cryptography;
 using NUnit.Framework;
 using RestSharp.Extensions;
 
@@ -32,5 +33,33 @@ public void FromXmlStringImpl_GivenPrivateKeyXml_GivesSameResultAsDotNetImplemen
                 Assert.AreEqual(dotnetBasedParameters.Q, customBasedParameters.Q);
             }
         }
+
+        [Test]
+        public void FromXmlStringImpl_GivenInvalidPrivateKeyXml_ThrowsInvalidOperationException()
+        {
+            const string samplePrivateKeyXml =
+                "<something></something>";
+
+            using (var provider = new RSACryptoServiceProvider())
+            {
+                var exception = Assert.Throws<InvalidOperationException>(() =>
+                    RSACryptoServiceProviderExtensions.FromXmlStringImpl(provider, samplePrivateKeyXml));
+                Assert.AreEqual("Invalid XML RSA key.", exception.Message);
+            }
+        }
+
+        [Test]
+        public void FromXmlStringImpl_GivenPrivateKeyXmlWithUnknownNode_ThrowsInvalidOperationException()
+        {
+            const string samplePrivateKeyXml =
+                "<RSAKeyValue><pi>unexpected</pi></RSAKeyValue>";
+
+            using (var provider = new RSACryptoServiceProvider())
+            {
+                var exception = Assert.Throws<InvalidOperationException>(() =>
+                    RSACryptoServiceProviderExtensions.FromXmlStringImpl(provider, samplePrivateKeyXml));
+                Assert.AreEqual("Unknown node name: pi", exception.Message);
+            }
+        }
     }
 }

RestSharp/Extensions/RSACryptoServiceProviderExtensions.cs

@@ -29,26 +29,43 @@ internal static void FromXmlStringImpl(RSACryptoServiceProvider rsa, string xmlS
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(xmlString);
 
-            if (xmlDoc.DocumentElement.Name.Equals("RSAKeyValue"))
+            if (!xmlDoc.DocumentElement.Name.Equals("RSAKeyValue"))
             {
-                foreach (XmlNode node in xmlDoc.DocumentElement.ChildNodes)
-                {
-                    switch (node.Name)
-                    {
-                        case "Modulus": parameters.Modulus = Convert.FromBase64String(node.InnerText); break;
-                        case "Exponent": parameters.Exponent = Convert.FromBase64String(node.InnerText); break;
-                        case "P": parameters.P = Convert.FromBase64String(node.InnerText); break;
-                        case "Q": parameters.Q = Convert.FromBase64String(node.InnerText); break;
-                        case "DP": parameters.DP = Convert.FromBase64String(node.InnerText); break;
-                        case "DQ": parameters.DQ = Convert.FromBase64String(node.InnerText); break;
-                        case "InverseQ": parameters.InverseQ = Convert.FromBase64String(node.InnerText); break;
-                        case "D": parameters.D = Convert.FromBase64String(node.InnerText); break;
-                    }
-                }
+                throw new InvalidOperationException("Invalid XML RSA key.");
             }
-            else
+
+
+            foreach (XmlNode node in xmlDoc.DocumentElement.ChildNodes)
             {
-                throw new InvalidOperationException("Invalid XML RSA key.");
+                switch (node.Name)
+                {
+                    case "Modulus":
+                        parameters.Modulus = Convert.FromBase64String(node.InnerText);
+                        break;
+                    case "Exponent":
+                        parameters.Exponent = Convert.FromBase64String(node.InnerText);
+                        break;
+                    case "P":
+                        parameters.P = Convert.FromBase64String(node.InnerText);
+                        break;
+                    case "Q":
+                        parameters.Q = Convert.FromBase64String(node.InnerText);
+                        break;
+                    case "DP":
+                        parameters.DP = Convert.FromBase64String(node.InnerText);
+                        break;
+                    case "DQ":
+                        parameters.DQ = Convert.FromBase64String(node.InnerText);
+                        break;
+                    case "InverseQ":
+                        parameters.InverseQ = Convert.FromBase64String(node.InnerText);
+                        break;
+                    case "D":
+                        parameters.D = Convert.FromBase64String(node.InnerText);
+                        break;
+                    default:
+                        throw new InvalidOperationException("Unknown node name: " + node.Name);
+                }
             }
 
             rsa.ImportParameters(parameters);