From a8710024f5d56c48bced1fd75e2fe95cc35813c1 Mon Sep 17 00:00:00 2001
From: pinzart90 <46732933+pinzart90@users.noreply.github.com>
Date: Mon, 8 Jan 2024 11:22:18 -0500
Subject: [PATCH] revert "stop loading UI nodes during DynamoCOre test
(#14712)" (#14818)
---
src/DynamoCore/Core/NodeModelAssemblyLoader.cs | 13 +------------
test/DynamoCoreTests/Setup.cs | 17 -----------------
2 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/src/DynamoCore/Core/NodeModelAssemblyLoader.cs b/src/DynamoCore/Core/NodeModelAssemblyLoader.cs
index fe5cc404f54..bdc8c777d27 100644
--- a/src/DynamoCore/Core/NodeModelAssemblyLoader.cs
+++ b/src/DynamoCore/Core/NodeModelAssemblyLoader.cs
@@ -79,12 +79,8 @@ private void OnAssemblyLoaded(Assembly assem)
}
}
- ///
- /// Should be used only in tests
- ///
- internal static event Func shouldLoadAssemblyPath;
#endregion
-
+
#region Methods
///
/// Load all types which inherit from NodeModel whose assemblies are located in
@@ -135,13 +131,6 @@ var assembly in
var result = new List();
var result2 = new List();
- if (Models.DynamoModel.IsTestMode)
- {
- if (shouldLoadAssemblyPath != null) {
- allDynamoAssemblyPaths = allDynamoAssemblyPaths.Where((path) => shouldLoadAssemblyPath(path)).ToList();
- }
- }
-
foreach (var assemblyPath in allDynamoAssemblyPaths)
{
var fn = Path.GetFileName(assemblyPath);
diff --git a/test/DynamoCoreTests/Setup.cs b/test/DynamoCoreTests/Setup.cs
index 7f9b2a8abd2..51a8589d12b 100644
--- a/test/DynamoCoreTests/Setup.cs
+++ b/test/DynamoCoreTests/Setup.cs
@@ -1,7 +1,6 @@
using System;
using System.IO;
using System.Reflection;
-using Dynamo.Models;
using Dynamo.Utilities;
using NUnit.Framework;
@@ -10,20 +9,6 @@ public class Setup
{
private AssemblyHelper assemblyHelper;
- ///
- /// Skip loading WPF nodes during DynamoCore tests because they will fail to load and will generate too many useless logs
- ///
- ///
- ///
- private bool NodeModelAssemblyLoader_shouldLoadAssemblyPath(string assemblyPath)
- {
- if (assemblyPath.Contains("WPF", StringComparison.OrdinalIgnoreCase) || assemblyPath.Contains("UI", StringComparison.OrdinalIgnoreCase))
- {
- return false;
- }
- return true;
- }
-
[OneTimeSetUp]
public void RunBeforeAllTests()
{
@@ -39,7 +24,6 @@ public void RunBeforeAllTests()
assemblyHelper = new AssemblyHelper(moduleRootFolder.FullName, resolutionPaths);
AppDomain.CurrentDomain.AssemblyResolve += assemblyHelper.ResolveAssembly;
- NodeModelAssemblyLoader.shouldLoadAssemblyPath += NodeModelAssemblyLoader_shouldLoadAssemblyPath;
}
[OneTimeTearDown]
@@ -47,6 +31,5 @@ public void RunAfterAllTests()
{
AppDomain.CurrentDomain.AssemblyResolve -= assemblyHelper.ResolveAssembly;
assemblyHelper = null;
- NodeModelAssemblyLoader.shouldLoadAssemblyPath -= NodeModelAssemblyLoader_shouldLoadAssemblyPath;
}
}