Skip to content

Commit

Permalink
stop loading UI nodes during DynamoCOre test (#14712)
Browse files Browse the repository at this point in the history
* update

* Update NodeModelAssemblyLoader.cs

* Update Setup.cs

---------

Co-authored-by: pinzart <[email protected]>
  • Loading branch information
pinzart90 and pinzart authored Dec 21, 2023
1 parent 3aa05f3 commit 1610ada
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
13 changes: 12 additions & 1 deletion src/DynamoCore/Core/NodeModelAssemblyLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,12 @@ private void OnAssemblyLoaded(Assembly assem)
}
}

/// <summary>
/// Should be used only in tests
/// </summary>
internal static event Func<string, bool> shouldLoadAssemblyPath;
#endregion

#region Methods
/// <summary>
/// Load all types which inherit from NodeModel whose assemblies are located in
Expand Down Expand Up @@ -131,6 +135,13 @@ var assembly in
var result = new List<TypeLoadData>();
var result2 = new List<TypeLoadData>();

if (Models.DynamoModel.IsTestMode)
{
if (shouldLoadAssemblyPath != null) {
allDynamoAssemblyPaths = allDynamoAssemblyPaths.Where((path) => shouldLoadAssemblyPath(path)).ToList();
}
}

foreach (var assemblyPath in allDynamoAssemblyPaths)
{
var fn = Path.GetFileName(assemblyPath);
Expand Down
17 changes: 17 additions & 0 deletions test/DynamoCoreTests/Setup.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.IO;
using System.Reflection;
using Dynamo.Models;
using Dynamo.Utilities;
using NUnit.Framework;

Expand All @@ -9,6 +10,20 @@ public class Setup
{
private AssemblyHelper assemblyHelper;

/// <summary>
/// Skip loading WPF nodes during DynamoCore tests because they will fail to load and will generate too many useless logs
/// </summary>
/// <param name="assemblyPath"></param>
/// <returns></returns>
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()
{
Expand All @@ -24,12 +39,14 @@ public void RunBeforeAllTests()

assemblyHelper = new AssemblyHelper(moduleRootFolder.FullName, resolutionPaths);
AppDomain.CurrentDomain.AssemblyResolve += assemblyHelper.ResolveAssembly;
NodeModelAssemblyLoader.shouldLoadAssemblyPath += NodeModelAssemblyLoader_shouldLoadAssemblyPath;
}

[OneTimeTearDown]
public void RunAfterAllTests()
{
AppDomain.CurrentDomain.AssemblyResolve -= assemblyHelper.ResolveAssembly;
assemblyHelper = null;
NodeModelAssemblyLoader.shouldLoadAssemblyPath -= NodeModelAssemblyLoader_shouldLoadAssemblyPath;
}
}

0 comments on commit 1610ada

Please sign in to comment.