diff --git a/test/DynamoCoreTests/SerializationTests.cs b/test/DynamoCoreTests/SerializationTests.cs
index 82e361a1af4..21faa8ee02c 100644
--- a/test/DynamoCoreTests/SerializationTests.cs
+++ b/test/DynamoCoreTests/SerializationTests.cs
@@ -277,14 +277,24 @@ public static void CompareWorkspaceModels(serializationTestUtils.WorkspaceCompar
{
var valueA = kvp.Value;
var valueB = b.NodeDataMap[kvp.Key];
+ var valANodeName = a.NodeTypeMap[kvp.Key].FullName;
// Ignore IntegerSlider nodes as they are being read as IntegerSlider64Bit JSON nodes.
// TODO: Remove this filter once we deprecate IntegerSlider nodes in a future Dynamo version.
- if (a.NodeTypeMap[kvp.Key].FullName == "CoreNodeModels.Input.IntegerSlider")
+ if (valANodeName == "CoreNodeModels.Input.IntegerSlider")
{
Assert.AreEqual("CoreNodeModels.Input.IntegerSlider64Bit", b.NodeTypeMap[kvp.Key].FullName);
continue;
}
+ //ignore file name/object nodes - the result is dependent on where the graph was run.
+ //which is modified during this test.
+
+ if (valANodeName.ToLower() == "corenodemodels.input.filename" ||
+ valANodeName.ToLower()== "corenodemodels.input.fileobject"||
+ valANodeName.ToLower() == "corenodemodels.input.directory")
+ {
+ continue;
+ }
Assert.AreEqual(a.NodeTypeMap[kvp.Key], b.NodeTypeMap[kvp.Key]);
@@ -389,15 +399,26 @@ public static void CompareWorkspacesDifferentGuids(serializationTestUtils.Worksp
//convert the old guid to the new guid
var newGuid = GuidUtility.Create(GuidUtility.UrlNamespace, modelGuidsToIDmap[kvp.Key]);
var valueB = b.NodeDataMap[newGuid];
+ var valANodeName = a.NodeTypeMap[kvp.Key].FullName;
// Ignore IntegerSlider nodes as they are being read as IntegerSlider64Bit JSON nodes.
// TODO: Remove this filter once we deprecate IntegerSlider nodes in a future Dynamo version.
- if (a.NodeTypeMap[kvp.Key].FullName == "CoreNodeModels.Input.IntegerSlider")
+ if (valANodeName == "CoreNodeModels.Input.IntegerSlider")
{
Assert.AreEqual("CoreNodeModels.Input.IntegerSlider64Bit", b.NodeTypeMap[newGuid].FullName);
continue;
}
+ //ignore file name/object nodes - the result is dependent on where the graph was run.
+ //which is modified during this test.
+
+ if (valANodeName.ToLower() == "corenodemodels.input.filename" ||
+ valANodeName.ToLower() == "corenodemodels.input.fileobject" ||
+ valANodeName.ToLower() == "corenodemodels.input.directory")
+ {
+ continue;
+ }
+
Assert.AreEqual(a.NodeTypeMap[kvp.Key], b.NodeTypeMap[newGuid]);
try
diff --git a/test/DynamoCoreWpfTests/SerializationTests.cs b/test/DynamoCoreWpfTests/SerializationTests.cs
index e41eb6d3dc2..aae2f7e7de8 100644
--- a/test/DynamoCoreWpfTests/SerializationTests.cs
+++ b/test/DynamoCoreWpfTests/SerializationTests.cs
@@ -962,7 +962,7 @@ private void ExecutionEvents_GraphPostExecution(Dynamo.Session.IExecutionSession
///
/// The path to a .dyn file. This parameter is supplied
/// by the test framework.
- [Test, TestCaseSource(nameof(FindWorkspaces)), Category("JsonTestExclude"), Category("Failure")]
+ [Test, TestCaseSource(nameof(FindWorkspaces)), Category("JsonTestExclude")]
public void SerializationTest(string filePath)
{
DoWorkspaceOpenAndCompareView(filePath,
@@ -981,7 +981,7 @@ public void SerializationTest(string filePath)
///
/// The path to a .dyn file. This parameter is supplied
/// by the test framework.
- [Test, TestCaseSource(nameof(FindWorkspaces)), Category("JsonTestExclude"), Category("Failure")]
+ [Test, TestCaseSource(nameof(FindWorkspaces)), Category("JsonTestExclude")]
public void SerializationNonGuidIdsTest(string filePath)
{
modelsGuidToIdMap.Clear();
@@ -1067,7 +1067,7 @@ public void NewCustomNodeSaveAndLoadPt2()
File.Delete(savePath);
}
- [Test, Category("Failure")]
+ [Test]
public void AllTypesSerialize()
{
var customNodeTestPath = Path.Combine(TestDirectory, @"core\serialization\serialization.dyn");