Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7abf66c
REVIT-238057: Add OOTB D4R sample tests with SetupUnzip
Fusneica-FlorentinCristian Apr 6, 2026
0ee962e
Merge remote-tracking branch 'origin/master' into fusneif/REVIT-23805…
Fusneica-FlorentinCristian Apr 23, 2026
bddc280
REVIT-238057: Address PR review — refactor OOTB_D4R_Tests
Fusneica-FlorentinCristian Apr 23, 2026
7288c0c
REVIT-238057: Update .gitignore to include packages directory
Fusneica-FlorentinCristian Apr 23, 2026
6609d64
Add logs directory to .gitignore to prevent tracking log files
Fusneica-FlorentinCristian Apr 23, 2026
c2df5c8
REVIT-238057: Add explicit using System for InvalidOperationException
Fusneica-FlorentinCristian Apr 23, 2026
b5eb9d0
REVIT-238057: Update OOTB D4R sample tests to use correct models per …
Fusneica-FlorentinCristian Apr 27, 2026
ce36648
Merge remote-tracking branch 'origin/master' into fusneif/REVIT-23805…
Fusneica-FlorentinCristian May 5, 2026
a50d36f
Address PR feedback: rename class, add node warning check, extract to…
Fusneica-FlorentinCristian May 6, 2026
1a90684
Fix test model paths to use models available in repo
Fusneica-FlorentinCristian May 6, 2026
47393d0
Use version-keyed temp cache with atomic extraction
Fusneica-FlorentinCristian May 6, 2026
6e76992
Add cache fallback when zip is absent
Fusneica-FlorentinCristian May 6, 2026
db46fcb
Comment out zip extraction priorities, keep for future use
Fusneica-FlorentinCristian May 6, 2026
d4b045b
Rename SetupUnzip to ResolveSamplePath, add locale probe, sort diagno…
Fusneica-FlorentinCristian May 6, 2026
7c2d132
Fix double semicolon, add comment clarifying SamplesPath distinction
Fusneica-FlorentinCristian May 6, 2026
81dcef8
Add graph-loaded assertion, clarify assembly location pattern
Fusneica-FlorentinCristian May 6, 2026
2609aac
Improve assertion diagnostics: show node messages and connector details
Fusneica-FlorentinCristian May 8, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ pip-log.txt

#Mr Developer
.mr.developer.cfg

packages/*
src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
test/Libraries/RevitIntegrationTests/RevitTestConfiguration.xml
test/**/*.txt
Expand All @@ -225,3 +227,4 @@ test/SystemInJson

# Icon resources
/src/DynamoRevitIcons/*.resources
logs/*
284 changes: 284 additions & 0 deletions test/Libraries/RevitIntegrationTests/OOTB_D4R_SampleTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
using System;
using System.IO;
// using System.IO.Compression; // Needed when zip extraction (priorities 2/3) is enabled
using System.Linq;
using System.Reflection;
using Dynamo.Graph.Nodes;
using NUnit.Framework;
using RevitTestServices;
using RTF.Framework;

namespace RevitSystemTests
{
/// <summary>
/// Tests for the Out-of-the-Box (OOTB) D4R sample scripts shipped as part of the
/// revit-d4r-content-samples artifact.
///
/// The .dyn files are resolved at runtime via <see cref="ResolveSamplePath"/> which checks
/// the already-deployed samples at DynamoForRevit\samples\{locale}\Revit\.
///
/// Future consideration: zip-based extraction is available as commented code below
/// (priorities 2 and 3) for scenarios where the samples are shipped as a zip artifact.
/// </summary>
[TestFixture]
class OOTB_D4R_SampleTests : RevitSystemTestBase
{
private static string ResolveSamplePath(string scriptFileName)
{
// Assembly.GetExecutingAssembly().Location is the standard pattern used throughout
// the test framework (RevitSystemTestBase, SystemTest, CoreTests, RegressionTests).
// RTF always loads test assemblies from the deployed DynamoForRevit\Revit\ folder.
string assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
Comment thread
Fusneica-FlorentinCristian marked this conversation as resolved.

// NOTE: We intentionally do NOT use the test configuration's core samples location
// (doc/distrib/Samples/ for Dynamo core samples). The D4R OOTB samples are deployed
// at DynamoForRevit\samples\{locale}\Revit\ alongside the plugin.
//
// When deployed to Revit (via RTF):
// assemblyDir = DynamoForRevit\Revit\
// parentDir = DynamoForRevit\
string parentDir = Path.GetDirectoryName(assemblyDir);

string samplesFolder = Path.Combine(parentDir, "samples");
Comment thread
Fusneica-FlorentinCristian marked this conversation as resolved.

Comment thread
Fusneica-FlorentinCristian marked this conversation as resolved.
Comment thread
Fusneica-FlorentinCristian marked this conversation as resolved.
// Priority 1: already-deployed samples — probe current culture then en-US fallback
if (Directory.Exists(samplesFolder))
{
var localesToProbe = new[]
{
System.Globalization.CultureInfo.CurrentUICulture.Name, // e.g. "fr-FR"
"en-US"
}.Distinct();

foreach (var locale in localesToProbe)
{
string localePath = Path.Combine(samplesFolder, locale, "Revit");
if (Directory.Exists(localePath))
{
var resolved = Path.Combine(localePath, scriptFileName);
if (File.Exists(resolved))
return resolved;
}
}
}

#region Future: zip-based extraction (priorities 2 and 3)
// // Priority 2: zip file — use version-keyed cache in temp to avoid staleness
// if (Directory.Exists(samplesFolder))
// {
// var zipFiles = Directory.GetFiles(
// samplesFolder,
// "revit-d4r-content-samples-*-net10.zip")
// .OrderBy(path => path)
// .ToArray();
//
// if (zipFiles.Length > 1)
// {
// var matches = zipFiles.Select(path => $"\n {path}");
// throw new InvalidOperationException(
// $"Multiple revit-d4r-content-samples archives were found in '{samplesFolder}', " +
// $"so the OOTB D4R sample source is ambiguous. Ensure exactly one matching zip is present." +
// $"{string.Concat(matches)}");
// }
//
// if (zipFiles.Length == 1)
// {
// // Derive cache folder name from zip filename to invalidate on version change
// string zipName = Path.GetFileNameWithoutExtension(zipFiles[0]);
// string extractedSamplesPath = Path.Combine(Path.GetTempPath(), "D4RSamples", zipName);
//
// // If already extracted for this version, use cached
// var resolved = Path.Combine(extractedSamplesPath, @"Samples\en-US\Revit", scriptFileName);
// if (File.Exists(resolved))
// return resolved;
//
// // Extract to staging dir, then move into place to avoid partial cache
// string stagingPath = extractedSamplesPath + "_staging_" + Guid.NewGuid().ToString("N")[..8];
// try
// {
// ZipFile.ExtractToDirectory(zipFiles[0], stagingPath);
// if (Directory.Exists(extractedSamplesPath))
// Directory.Delete(extractedSamplesPath, recursive: true);
// Directory.Move(stagingPath, extractedSamplesPath);
// }
// catch
// {
// // Clean up staging on failure so next run can retry
// if (Directory.Exists(stagingPath))
// Directory.Delete(stagingPath, recursive: true);
// throw;
// }
//
// resolved = Path.Combine(extractedSamplesPath, @"Samples\en-US\Revit", scriptFileName);
// if (File.Exists(resolved))
// return resolved;
// }
// }
//
// // Priority 3: reuse any previously cached extraction (zip may have been removed)
// string cacheRoot = Path.Combine(Path.GetTempPath(), "D4RSamples");
// if (Directory.Exists(cacheRoot))
// {
// var cached = Directory.GetDirectories(cacheRoot)
// .OrderByDescending(d => Directory.GetLastWriteTime(d))
// .Select(d => Path.Combine(d, @"Samples\en-US\Revit", scriptFileName))
// .FirstOrDefault(File.Exists);
// if (cached != null)
// return cached;
// }
#endregion

// Provide a useful diagnostic message to help locate the issue
if (Directory.Exists(samplesFolder))
{
var entries = Directory.EnumerateFileSystemEntries(samplesFolder)
.OrderBy(e => e)
.Select(e => $"\n {e}");
throw new FileNotFoundException(
$"Cannot locate OOTB D4R sample script '{scriptFileName}'.\n" +
$"Checked samples folder: {samplesFolder}\n" +
$"Contents:{string.Concat(entries)}");
Comment thread
Fusneica-FlorentinCristian marked this conversation as resolved.
}
else
{
var parentEntries = Directory.Exists(parentDir)
? Directory.EnumerateDirectories(parentDir).OrderBy(e => e).Select(e => $"\n {e}")
: Enumerable.Empty<string>();
throw new FileNotFoundException(
$"Cannot locate OOTB D4R sample script '{scriptFileName}'.\n" +
$"Expected samples folder not found: {samplesFolder}\n" +
$"Parent dir contents:{string.Concat(parentEntries)}");
}
}

private void OpenAndRunSample(string scriptFileName)
{
string samplePath = ResolveSamplePath(scriptFileName);
string testPath = Path.GetFullPath(samplePath);

ViewModel.OpenCommand.Execute(testPath);

Assert.IsTrue(
ViewModel.Model.CurrentWorkspace.Nodes.Any(),
$"Graph '{scriptFileName}' opened but contains no nodes — file may not have loaded correctly.");

AssertNoDummyNodes();

// Verify no broken connectors — a missing start/end port indicates a load problem
// (e.g. renamed or removed node ports between versions).
var brokenConnectors = ViewModel.Model.CurrentWorkspace.Connectors
.Where(c => c.Start == null || c.End == null).ToList();

if (brokenConnectors.Any())
{
var details = string.Join("\n", brokenConnectors.Select(c =>
{
string startInfo = c.Start != null
? $"{c.Start.Owner?.Name}:{c.Start.Name}[{c.Start.Index}]"
: "<null>";
string endInfo = c.End != null
? $"{c.End.Owner?.Name}:{c.End.Name}[{c.End.Index}]"
: "<null>";
return $" Connector {c.GUID}: Start={startInfo} → End={endInfo}";
}));

Assert.Fail(
$"Graph '{scriptFileName}' has {brokenConnectors.Count} broken connector(s) " +
$"with missing start or end port:\n{details}");
}

RunCurrentModel();

var errorNodes = ViewModel.Model.CurrentWorkspace.Nodes.Where(
n => n.State == ElementState.Error || n.State == ElementState.Warning).ToList();
Comment thread
Fusneica-FlorentinCristian marked this conversation as resolved.

if (errorNodes.Any())
{
var details = string.Join("\n", errorNodes.Select(n =>
{
var messages = n.NodeInfos
.Where(i => i.State == ElementState.Error || i.State == ElementState.Warning)
.Select(i => $" [{i.State}] {i.Message}");
string msgBlock = messages.Any()
? "\n" + string.Join("\n", messages)
: " (no message details)";
return $" [{n.State}] {n.Name} ({n.GetType().Name}, GUID: {n.GUID}){msgBlock}";
}));

Assert.Fail(
$"After RunCurrentModel(), {errorNodes.Count} node(s) are in error/warning state " +
$"in '{scriptFileName}':\n{details}");
}
}

[Test, Category("SmokeTests")]
[TestModel(@".\empty.rfa")]
public void Revit_Geometry_Creation_Points()
{
OpenAndRunSample("Revit Geometry Creation Points.dyn");
}

[Test, Category("SmokeTests")]
[TestModel(@".\empty.rfa")]
public void Revit_Geometry_Creation_Curves()
{
OpenAndRunSample("Revit Geometry Creation Curves.dyn");
}

[Test, Category("SmokeTests")]
[TestModel(@".\MassWithBoxAndCone.rfa")]
public void Revit_Geometry_Creation_Solids()
{
OpenAndRunSample("Revit Geometry Creation Solids.dyn");
}

[Test, Category("SmokeTests")]
[TestModel(@".\MassWithBoxAndCone.rfa")]
public void Revit_Geometry_Creation_Surfaces()
{
OpenAndRunSample("Revit Geometry Creation Surfaces.dyn");
}

[Test, Category("SmokeTests")]
[TestModel(@".\AdaptiveComponents.rfa")]
public void Revit_Adaptive_Component_Placement()
{
OpenAndRunSample("Revit Adaptive Component Placement.dyn");
}

[Test, Category("SmokeTests")]
[TestModel(@".\SampleModel.rvt")]
public void Revit_Color()
Comment thread
Fusneica-FlorentinCristian marked this conversation as resolved.
{
OpenAndRunSample("Revit Color.dyn");
}

[Test, Category("SmokeTests")]
[TestModel(@".\SampleModel.rvt")]
public void Revit_Floors_and_Framing()
{
OpenAndRunSample("Revit Floors and Framing.dyn");
}

[Test, Category("SmokeTests")]
[TestModel(@".\SampleModel.rvt")]
public void Revit_Import_Solid()
{
OpenAndRunSample("Revit Import Solid.dyn");
}

[Test, Category("SmokeTests")]
[TestModel(@".\SampleModel.rvt")]
public void Revit_Place_Families_By_Level_Set_Parameters()
{
OpenAndRunSample("Revit Place Families By Level Set Parameters.dyn");
}

[Test, Category("SmokeTests")]
[TestModel(@".\StructuralFraming\StructuralFraming.rvt")]
public void Revit_Structural_Framing()
Comment thread
Fusneica-FlorentinCristian marked this conversation as resolved.
{
OpenAndRunSample("Revit Structural Framing.dyn");
}
}
}