feat: updated tests to avoid rare bug with uninstalled versions

Author: psarras

OasysGH/Helpers/RhinoResolver.cs

@@ -5,7 +5,9 @@
 using System;
 
 public class RhinoResolver {
+  private const string Coredllpath = "CoreDllPath";
   private static string rhinoSystemDirectory;
+  const string RhinoKey = "SOFTWARE\\McNeel\\Rhinoceros";
 
   public static string RhinoSystemDirectory {
     get {
@@ -20,6 +22,7 @@ public static string RhinoSystemDirectory {
 
   public static int RhinoMajorVersion { get; set; }
 
+
   public static void Initialize() {
     if (IntPtr.Size != 8) {
       throw new Exception("Only 64 bit applications can use Rhino");
@@ -39,21 +42,20 @@ private static Assembly ResolveForRhinoAssemblies(object sender, ResolveEventArg
     return null;
   }
 
-  private static string FindRhinoSystemDirectory() {
+  public static string FindRhinoSystemDirectory() {
     bool useLatest = RhinoMajorVersion < 0;
 
-    string name = "SOFTWARE\\McNeel\\Rhinoceros";
-    using (RegistryKey registryKey = Registry.LocalMachine.OpenSubKey(name)) {
-      string[] subKeyNames = registryKey.GetSubKeyNames();
-      Array.Sort(subKeyNames);
-      string text = "";
+    string[] subKeyNames = GetSubKeys(RhinoKey);
+
+    using (RegistryKey registryKey = Registry.LocalMachine.OpenSubKey(RhinoKey)) {
+      string text = string.Empty;
       for (int num = subKeyNames.Length - 1; num >= 0; num--) {
         if (double.TryParse(subKeyNames[num], NumberStyles.Any, CultureInfo.InvariantCulture, out double result)) {
           text = subKeyNames[num];
           if (useLatest || (int)Math.Floor(result) == RhinoMajorVersion) {
             using RegistryKey registryKey2 = registryKey.OpenSubKey(text + "\\Install");
             try {
-              object value = registryKey2.GetValue("CoreDllPath");
+              object value = registryKey2.GetValue(Coredllpath);
               if (value == null)
                 continue;
               if (value is string path && File.Exists(path)) {
@@ -70,4 +72,16 @@ private static string FindRhinoSystemDirectory() {
 
     return null;
   }
+
+  public string[] GetRhinoSubKeys() {
+    return GetSubKeys(RhinoKey);
+  }
+
+  public static string[] GetSubKeys(string rhinoKey) {
+    using (RegistryKey registryKey = Registry.LocalMachine.OpenSubKey(rhinoKey)) {
+      string[] subKeyNames = registryKey.GetSubKeyNames();
+      Array.Sort(subKeyNames);
+      return subKeyNames;
+    }
+  }
 }

OasysGHTests/Helpers/ResolverTest.cs

@@ -10,30 +10,20 @@
 namespace OasysGHTests.Helpers {
   public class ResolverTest {
     [Fact]
-    public void ResolverReturnLatestInstalledRhinoPath() {
-      string name = "SOFTWARE\\McNeel\\Rhinoceros";
-      int initialRhinoMajorVersion = RhinoResolver.RhinoMajorVersion;
-      double rhinoMajorVersion = -1;
-      using (RegistryKey registryKey = Registry.LocalMachine.OpenSubKey(name)) {
-        string[] subKeyNames = registryKey.GetSubKeyNames();
-        Array.Sort(subKeyNames);
-        double.TryParse(subKeyNames[subKeyNames.Length - 1], NumberStyles.Any, CultureInfo.InvariantCulture, out rhinoMajorVersion);
-      }
-      RhinoResolver.Initialize();
-      string expectedPath = $"C:\\Program Files\\Rhino {rhinoMajorVersion}\\System";
-      Assert.Equal(RhinoResolver.RhinoSystemDirectory, expectedPath);
-      RhinoResolver.RhinoMajorVersion = initialRhinoMajorVersion;
-      RhinoResolver.RhinoSystemDirectory = "";
+    public void ShouldReturnAValidPath() {
+      string directory = RhinoResolver.FindRhinoSystemDirectory();
+      Assert.True(File.Exists(directory));
     }
 
     [Fact]
-    public void ResolverReturnNoRhinoPathWhenRequestedVersionNotInstalled() {
-      int initialRhinoMajorVersion = RhinoResolver.RhinoMajorVersion;
-      RhinoResolver.Initialize();
-      RhinoResolver.RhinoMajorVersion = 1;
-      Assert.Null(RhinoResolver.RhinoSystemDirectory);
-      RhinoResolver.RhinoMajorVersion = initialRhinoMajorVersion;
-      RhinoResolver.RhinoSystemDirectory = "";
+    public void SubKeyMissingShouldReturnFalse() {
+      Assert.Throws<NullReferenceException>(() => RhinoResolver.GetSubKeys("INVALID_KEY"));
+    }
+
+    [Fact]
+    public void ShouldHaveSomeKeys() {
+      var rhinoSolver = new RhinoResolver();
+      Assert.True(rhinoSolver.GetRhinoSubKeys().Length > 0);
     }
   }
 }