fixing errors

Signed-off-by: Neil South <[email protected]>
Project-MONAI · Sep 7, 2023 · 37b81b6 · 37b81b6
1 parent a974b0b
commit 37b81b6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/InformaticsGateway/Common/TypeExtensions.cs b/src/InformaticsGateway/Common/TypeExtensions.cs
@@ -57,7 +57,7 @@ public static Type GetType(this Type interfaceType, string typeString)
                       {
                           var assembly = AppDomain.CurrentDomain.GetAssemblies().ToList().Find(z => !string.IsNullOrWhiteSpace(z.FullName) && z.FullName.StartsWith(name.FullName));
 
-                          assembly ??= Assembly.Load(Path.Combine(SR.PlugInDirectoryPath, $"{name.Name}.dll"));
+                          assembly ??= Assembly.LoadFile(Path.Combine(SR.PlugInDirectoryPath, $"{name.Name}.dll"));
 
                           return assembly;
                       },

diff --git a/src/InformaticsGateway/Services/Common/IInputDataPluginEngineFactory.cs b/src/InformaticsGateway/Services/Common/IInputDataPluginEngineFactory.cs
@@ -101,7 +101,7 @@ private void LoadAssembliesFromPlugInsDirectory()
                 foreach (var file in files)
                 {
                     _logger.LoadingAssembly(file);
-                    var assembly = Assembly.Load(file);
+                    var assembly = Assembly.LoadFile(file);
                     var matchingTypes = assembly.GetTypes().Where(p => _type.IsAssignableFrom(p) && p != _type).ToList();
 
                     AddToCache(matchingTypes);

diff --git a/src/InformaticsGateway/Test/Services/Common/InputDataPluginEngineTest.cs b/src/InformaticsGateway/Test/Services/Common/InputDataPluginEngineTest.cs
@@ -102,7 +102,7 @@ public async Task GivenAnInputDataPlugInEngine_WhenExecutePlugInsIsCalledWithout
                 "calling",
                 "called");
 
-            await Assert.ThrowsAsync<ApplicationException>(async () => await pluginEngine.ExecutePlugInsAsync(dicomFile, dicomInfo));
+            await Assert.ThrowsAsync<PlugInInitializationException>(async () => await pluginEngine.ExecutePlugInsAsync(dicomFile, dicomInfo));
         }
 
         [Fact]

diff --git a/src/InformaticsGateway/Test/Services/Common/OutputDataPluginEngineTest.cs b/src/InformaticsGateway/Test/Services/Common/OutputDataPluginEngineTest.cs
@@ -102,7 +102,7 @@ public async Task GivenAnOutputDataPlugInEngine_WhenExecutePlugInsIsCalledWithou
                 WorkflowInstanceId = Guid.NewGuid().ToString(),
             }, "filename.dcm");
 
-            await Assert.ThrowsAsync<ApplicationException>(async () => await pluginEngine.ExecutePlugInsAsync(message));
+            await Assert.ThrowsAsync<PlugInInitializationException>(async () => await pluginEngine.ExecutePlugInsAsync(message));
         }
 
         [Fact]