Remove references to PrivateObject and PrivateType classes

These are not supported in later versions of .Net

Author: Tkael

EDDI/App.xaml

@@ -4,6 +4,5 @@
              xmlns:local="clr-namespace:Eddi"
              StartupUri="EddiUI.MainWindow.xaml">
     <Application.Resources>
-
     </Application.Resources>
 </Application>

EddiInaraService/InaraService.cs

@@ -187,7 +187,7 @@ public List<InaraResponse> SendEventBatch ( List<InaraAPIEvent> events, InaraCon
             return inaraResponses;
         }
 
-        private List<InaraAPIEvent> IndexAndFilterAPIEvents(List<InaraAPIEvent> events, InaraConfiguration inaraConfiguration)
+        internal List<InaraAPIEvent> IndexAndFilterAPIEvents(List<InaraAPIEvent> events, InaraConfiguration inaraConfiguration)
         {
             // If we don't have a commander name then only use `get` events and re-enqueue the rest.
             if (string.IsNullOrEmpty(inaraConfiguration.commanderName))

JournalMonitor/JournalMonitor.cs

@@ -9,13 +9,15 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Controls;
 using Utilities;
 
+[assembly: InternalsVisibleTo("Tests")]
 namespace EddiJournalMonitor
 {
     public class JournalMonitor : LogMonitor, IEddiMonitor
@@ -37,7 +39,7 @@ private enum ShipyardType { [UsedImplicitly] ShipsHere, [UsedImplicitly] ShipsRe
         private static readonly Dictionary<long, CancellationTokenSource> carrierJumpCancellationTokenSources =
             new Dictionary<long, CancellationTokenSource>();
 
-        private static CancellationTokenSource ShipShutdownCancellationTokenSource;
+        internal static CancellationTokenSource ShipShutdownCancellationTokenSource;
 
         private static void ForwardJournalEntries ( IList<string> lines, Action<Event> callback, bool isLogLoadEventBatch )
         {

SpeechResponder/CopyPersonalityWindow.xaml.cs

@@ -5,7 +5,7 @@
 
 namespace EddiSpeechResponder
 {
-    using resx = Properties.SpeechResponder;
+    using resX = Properties.SpeechResponder;
 
     /// <summary>
     /// Interaction logic for CopyPersonalityWindow.xaml
@@ -114,12 +114,12 @@ string ValidatePersonalityName()
 
             if (string.IsNullOrEmpty(trimmedName))
             {
-                return resx.validation_tooltip_name_empty;
+                return resX.validation_tooltip_name_empty;
             }
 
             if (existingNames.Contains(trimmedName))
             {
-                return resx.validation_tooltip_name_taken;
+                return resX.validation_tooltip_name_taken;
             }
 
             return string.Empty;

SpeechResponder/CustomFunctions/ShipCallsign.cs

@@ -51,7 +51,7 @@ public class ShipCallsign : ICustomFunction
             }
         }, 0, 2);
 
-        private static string phoneticCallsign(Ship ship, string id)
+        internal static string phoneticCallsign(Ship ship, string id)
         {
             if (string.IsNullOrEmpty(ship?.manufacturer) || string.IsNullOrEmpty(id)) { return string.Empty; }
 

Tests/CustomFunctions.cs

@@ -35,8 +35,7 @@ private string ResolveScript(string script, Dictionary<string, Tuple<Type, Value
         public void TestShipCallsignFunction(string shipModel, string id, string expected)
         {
             var ship = ShipDefinitions.FromEDModel(shipModel);
-            var privateType = new PrivateType(typeof(ShipCallsign));
-            Assert.AreEqual(expected, (string)privateType.InvokeStatic("phoneticCallsign", new object[] { ship, id }));
+            Assert.AreEqual( expected, ShipCallsign.phoneticCallsign( ship, id ) );
         }
 
         [DataTestMethod]

Tests/InaraTests.cs

@@ -28,9 +28,8 @@ public void TestIndexAndFilterAPIEvents()
                 new InaraAPIEvent(DateTime.UtcNow, "getCommanderProfile", new Dictionary<string, object> { { "searchName", "Artie" } }),
                 new InaraAPIEvent(DateTime.UtcNow, "addCommanderCombatDeath", new Dictionary<string, object> { { "starsystemName", "LP 932-12" }, { "opponentName", "Vincent Van Stoi" } })
             };
-            var privateInaraService = new PrivateObject(typeof(InaraService));
-            var results = (List<InaraAPIEvent>)privateInaraService.Invoke("IndexAndFilterAPIEvents", inaraAPIEvents, new InaraConfiguration() );
-
+            
+            var results = ((InaraService)inaraService).IndexAndFilterAPIEvents( inaraAPIEvents, new InaraConfiguration() );
             if (results?.Count == 2)
             {
                 // Check that appropriate response IDs were assigned to each API event

Tests/JournalMonitorTests.cs

@@ -2482,9 +2482,7 @@ public void TestExplorationSequence()
         [TestMethod, DoNotParallelize]
         public void TestRepeatedShipShutdownEvents ()
         {
-            var privateType = new PrivateType( typeof(JournalMonitor) );
-            // ReSharper disable once AssignNullToNotNullAttribute - CancellationTokenSource is nullable.
-            privateType.SetStaticFieldOrProperty( "ShipShutdownCancellationTokenSource", null );
+            JournalMonitor.ShipShutdownCancellationTokenSource = null;
 
             // Trigger a `ShipShutdown` event.
             var events = JournalMonitor.ParseJournalEntries( new [] {@"{ ""timestamp"":""2023-11-24T20:22:45Z"", ""event"":""SystemsShutdown"" }" } );
@@ -2508,9 +2506,7 @@ public void TestRepeatedShipShutdownEvents ()
         [TestMethod, DoNotParallelize]
         public void TestShipShutdownThargoidTitanPulse ()
         {
-            var privateType = new PrivateType( typeof(JournalMonitor) );
-            // ReSharper disable once AssignNullToNotNullAttribute - CancellationTokenSource is nullable.
-            privateType.SetStaticFieldOrProperty( "ShipShutdownCancellationTokenSource", null );
+            JournalMonitor.ShipShutdownCancellationTokenSource = null;
 
             //The `SystemsShutdown` event should be ignored because it is followed immediately by a `MaterialCollected` event for the material `tg_shutdowndata` and no shutdown in fact occurs for this circumstance.
             var lines = new[]

Tests/OAuthClientIDTests.cs

@@ -8,9 +8,8 @@ public class OAuthClientIDTests
         [TestMethod]
         public void TestClientIDNotNull()
         {
-            var clientIDClass = new PrivateType(typeof(EddiCompanionAppService.ClientId));
-            var clientID = clientIDClass.GetStaticField("ID");
-            Assert.IsInstanceOfType(clientID, typeof(string));
+            var clientID = EddiCompanionAppService.ClientId.ID;
+            Assert.IsInstanceOfType( clientID, typeof(string));
             Assert.IsNotNull( clientID );
         }
     }

Tests/TelemetryTests.cs

@@ -3,7 +3,6 @@
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using Utilities;
 
 namespace Tests
@@ -13,8 +12,7 @@ public class TelemetryTests : TestBase
     {
         private Dictionary<string, object> PrepTelemetryData(object data)
         {
-            var privateType = new PrivateType(typeof(Logging));
-            var result = (Task<Dictionary<string, object>>)privateType.InvokeStatic("PrepareData", JToken.FromObject(data) );
+            var result = Logging.PrepareData( JToken.FromObject( data ) );
             return result.Result;
         }