From 4720170e846b6650db8f1195fdf3d56195cd8e89 Mon Sep 17 00:00:00 2001 From: "mjk.kirschner" Date: Thu, 9 Nov 2023 17:22:09 -0500 Subject: [PATCH 1/3] fix all types serialize --- test/DynamoCoreTests/SerializationTests.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/DynamoCoreTests/SerializationTests.cs b/test/DynamoCoreTests/SerializationTests.cs index 82e361a1af4..c66a8303492 100644 --- a/test/DynamoCoreTests/SerializationTests.cs +++ b/test/DynamoCoreTests/SerializationTests.cs @@ -285,6 +285,11 @@ public static void CompareWorkspaceModels(serializationTestUtils.WorkspaceCompar Assert.AreEqual("CoreNodeModels.Input.IntegerSlider64Bit", b.NodeTypeMap[kvp.Key].FullName); continue; } + //ignore file name - the result is dependent on where the graph is. + if (a.NodeTypeMap[kvp.Key].FullName == "CoreNodeModels.Input.Filename") + { + continue; + } Assert.AreEqual(a.NodeTypeMap[kvp.Key], b.NodeTypeMap[kvp.Key]); From f04c29e6c0f1972c53320e7d75b7ad9b7a878b15 Mon Sep 17 00:00:00 2001 From: "mjk.kirschner" Date: Thu, 9 Nov 2023 20:24:02 -0500 Subject: [PATCH 2/3] fix serialization tests --- test/DynamoCoreTests/SerializationTests.cs | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/test/DynamoCoreTests/SerializationTests.cs b/test/DynamoCoreTests/SerializationTests.cs index c66a8303492..21faa8ee02c 100644 --- a/test/DynamoCoreTests/SerializationTests.cs +++ b/test/DynamoCoreTests/SerializationTests.cs @@ -277,16 +277,21 @@ 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 - the result is dependent on where the graph is. - if (a.NodeTypeMap[kvp.Key].FullName == "CoreNodeModels.Input.Filename") + //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; } @@ -394,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 From aaa9906a38b61b91d9f8dc1a5ebcfb6032b4eaab Mon Sep 17 00:00:00 2001 From: "mjk.kirschner" Date: Thu, 9 Nov 2023 20:24:43 -0500 Subject: [PATCH 3/3] remove failure --- test/DynamoCoreWpfTests/SerializationTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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");