From b97410dab784f657080d840f5cc6fdf5476148bc Mon Sep 17 00:00:00 2001
From: David Sparer <David.Sparer@pearson.com>
Date: Mon, 17 Oct 2016 12:25:07 -0600
Subject: [PATCH] Removed unused/unnecessary code

---
 .../Security/SecureStringExtensionsTests.cs   | 42 +++++++++++++++++++
 mRemoteNGTests/mRemoteNGTests.csproj          |  1 +
 mRemoteV1/Security/SecureStringExtensions.cs  | 11 -----
 3 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 mRemoteNGTests/Security/SecureStringExtensionsTests.cs

diff --git a/mRemoteNGTests/Security/SecureStringExtensionsTests.cs b/mRemoteNGTests/Security/SecureStringExtensionsTests.cs
new file mode 100644
index 00000000..35f7d2a5
--- /dev/null
+++ b/mRemoteNGTests/Security/SecureStringExtensionsTests.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Security;
+using mRemoteNG.Security;
+using NUnit.Framework;
+using NUnit.Framework.Constraints;
+
+
+namespace mRemoteNGTests.Security
+{
+    public class SecureStringExtensionsTests
+    {
+        [Test]
+        public void ConvertToSecureString()
+        {
+            var securedString = "MySecureString".ConvertToSecureString();
+            Assert.That(securedString.Length, Is.GreaterThan(0));
+        }
+
+        [Test]
+        public void ConvertToUnsecureString()
+        {
+            var originalText = "MySecureString";
+            var securedString = originalText.ConvertToSecureString();
+            var unsecuredString = securedString.ConvertToUnsecureString();
+            Assert.That(unsecuredString, Is.EqualTo(originalText));
+        }
+
+        [Test]
+        public void ConvertToSecureStringOnNullStringThrowsException()
+        {
+            string myString = null;
+            Assert.Throws<ArgumentNullException>(() => myString.ConvertToSecureString());
+        }
+
+        [Test]
+        public void ConvertToUnsecureStringOnNullStringThrowsException()
+        {
+            SecureString secureString = null;
+            Assert.Throws<ArgumentNullException>(() => secureString.ConvertToUnsecureString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/mRemoteNGTests/mRemoteNGTests.csproj b/mRemoteNGTests/mRemoteNGTests.csproj
index 03141968..3ee05503 100644
--- a/mRemoteNGTests/mRemoteNGTests.csproj
+++ b/mRemoteNGTests/mRemoteNGTests.csproj
@@ -118,6 +118,7 @@
     <Compile Include="Connection\Protocol\ProtocolListTests.cs" />
     <Compile Include="Security\Authentication\PasswordAuthenticatorTests.cs" />
     <Compile Include="Security\KeyDerivation\Pkcs5S2KeyGeneratorTests.cs" />
+    <Compile Include="Security\SecureStringExtensionsTests.cs" />
     <Compile Include="Tools\ExternalToolsArgumentParserTests.cs" />
     <Compile Include="Tree\ConnectionTreeDragAndDropHandlerTests.cs" />
     <Compile Include="Tree\ConnectionTreeModelTests.cs" />
diff --git a/mRemoteV1/Security/SecureStringExtensions.cs b/mRemoteV1/Security/SecureStringExtensions.cs
index 05188af6..122aee24 100644
--- a/mRemoteV1/Security/SecureStringExtensions.cs
+++ b/mRemoteV1/Security/SecureStringExtensions.cs
@@ -31,17 +31,6 @@ namespace mRemoteNG.Security
             }
         }
 
-        public static string ConvertToEncryptedString(this SecureString secureString)
-        {
-            return "TEST ENCRYPTION";
-        }
-
-        public static SecureString ConvertFromEncryptedString(this SecureString secureString, string encryptedString)
-        {
-            var unencryptedString = encryptedString;
-            return unencryptedString.ConvertToSecureString();
-        }
-
         public static SecureString ConvertToSecureString(this string unsecuredPassword)
         {
             if (unsecuredPassword == null)