From d1dd01f98d9cecf865b81773007d830260616354 Mon Sep 17 00:00:00 2001 From: Roberto T <61755417+RobertGlobant20@users.noreply.github.com> Date: Sun, 12 Jan 2025 13:15:13 -0800 Subject: [PATCH] DYN-7963 Obsolote Excel Interop Nodes (#15743) --- src/Libraries/DSOffice/Excel.cs | 15 ++- .../DSOffice/Properties/Resources.Designer.cs | 18 ++++ .../DSOffice/Properties/Resources.en-US.resx | 6 ++ .../DSOffice/Properties/Resources.resx | 6 ++ test/DynamoCoreTests/ExcelTests.cs | 2 +- .../DynamoMSOfficeTests/ExcelTests.cs | 96 +++++++++---------- test/Libraries/WorkflowTests/DynamoSamples.cs | 4 +- .../MarkdownGeneratorCommandTests.cs | 2 +- 8 files changed, 96 insertions(+), 53 deletions(-) diff --git a/src/Libraries/DSOffice/Excel.cs b/src/Libraries/DSOffice/Excel.cs index bc2c05e370f..f822aca7240 100644 --- a/src/Libraries/DSOffice/Excel.cs +++ b/src/Libraries/DSOffice/Excel.cs @@ -16,12 +16,14 @@ public static class Excel /// /// [IsVisibleInDynamoLibrary(false)] + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static WorkBook ReadExcelFile(FileInfo file) { return WorkBook.ReadExcelFile(file.FullName); } [IsVisibleInDynamoLibrary(false)] + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static WorkBook ReadExcelFile(string file) { return WorkBook.ReadExcelFile(file); @@ -33,6 +35,7 @@ public static WorkBook ReadExcelFile(string file) /// /// [IsVisibleInDynamoLibrary(false)] + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static WorkSheet[] GetWorksheetsFromExcelWorkbook(WorkBook workbook) { return workbook.WorkSheets; @@ -45,6 +48,7 @@ public static WorkSheet[] GetWorksheetsFromExcelWorkbook(WorkBook workbook) /// /// [IsVisibleInDynamoLibrary(false)] + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static WorkSheet GetExcelWorksheetByName(WorkBook workbook, string name) { return workbook.GetWorksheetByName(name); @@ -56,6 +60,7 @@ public static WorkSheet GetExcelWorksheetByName(WorkBook workbook, string name) /// /// [IsVisibleInDynamoLibrary(false)] + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static object[][] GetDataFromExcelWorksheet(WorkSheet worksheet) { return worksheet.Data; @@ -71,6 +76,7 @@ public static object[][] GetDataFromExcelWorksheet(WorkSheet worksheet) /// /// [IsVisibleInDynamoLibrary(false)] + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static WorkSheet WriteDataToExcelWorksheet( WorkSheet worksheet, int startRow = 0, int startColumn = 0, object[][] data = null) { @@ -87,6 +93,7 @@ public static WorkSheet WriteDataToExcelWorksheet( /// /// [IsVisibleInDynamoLibrary(false)] + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static WorkSheet AddExcelWorksheetToWorkbook(WorkBook workbook, string name) { return new WorkSheet(workbook, name); @@ -97,6 +104,7 @@ public static WorkSheet AddExcelWorksheetToWorkbook(WorkBook workbook, string na /// /// [IsVisibleInDynamoLibrary(false)] + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static WorkBook NewExcelWorkbook() { return new WorkBook(""); @@ -109,6 +117,7 @@ public static WorkBook NewExcelWorkbook() /// /// [IsVisibleInDynamoLibrary(false)] + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static WorkBook SaveAsExcelWorkbook(WorkBook workbook, string filename) { return new WorkBook(workbook, filename); @@ -127,6 +136,7 @@ public static WorkBook SaveAsExcelWorkbook(WorkBook workbook, string filename) /// Rows of data from the Excel worksheet. /// office,excel,spreadsheet,ifequalreturnindex [IsVisibleInDynamoLibrary(false)] + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static object[][] ReadFromFile(FileInfo file, string sheetName, bool readAsStrings = false, bool showExcel = true) { object[][] data; @@ -178,6 +188,7 @@ public static object[][] Read(string filePath, string sheetName) /// Data written to the spreadsheet. /// office,excel,spreadsheet [IsVisibleInDynamoLibrary(false)] + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static object[][] WriteToFile(string filePath, string sheetName, int startRow, int startCol, object[][] data, bool overWrite = false) { return ExcelWriteUtils.WriteData(filePath, sheetName, startRow, startCol, data, overWrite); @@ -201,6 +212,7 @@ public static partial class Data /// Toggle to show excel's main window /// Rows of data from the Excel worksheet /// office,excel,spreadsheet,ifequalreturnindex + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static object[][] ImportExcel(FileInfo file, string sheetName, bool readAsStrings = false, bool showExcel = true) { return Excel.ReadFromFile(file, sheetName, readAsStrings, showExcel); @@ -223,7 +235,7 @@ public static object[][] ImportExcel(FileInfo file, string sheetName, bool readA /// True to overwrite file, false not to overwrite /// Data written to the spreadsheet /// office,excel,spreadsheet - [Obsolete("Use ExportToExcel instead.")] + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static object[][] ExportExcel(string filePath, string sheetName, int startRow, int startColumn, object[][] data, bool overWrite = false) { return ExcelWriteUtils.WriteData(filePath, sheetName, startRow, startColumn, data, overWrite); @@ -247,6 +259,7 @@ public static object[][] ExportExcel(string filePath, string sheetName, int star /// Toggle to switch between writing Excel file as strings /// Rows of data from the Excel worksheet /// office,excel,spreadsheet + [NodeObsolete("ExcelInteropObsoleteNode", typeof(Properties.Resources))] public static object[][] ExportToExcel(string filePath, string sheetName, int startRow, int startColumn, object[][] data, bool overWrite = false, bool writeAsString = false) { return ExcelWriteUtils.WriteData(filePath, sheetName, startRow, startColumn, data, overWrite, writeAsString); diff --git a/src/Libraries/DSOffice/Properties/Resources.Designer.cs b/src/Libraries/DSOffice/Properties/Resources.Designer.cs index c54680ab6d7..3eeb30e5153 100644 --- a/src/Libraries/DSOffice/Properties/Resources.Designer.cs +++ b/src/Libraries/DSOffice/Properties/Resources.Designer.cs @@ -60,6 +60,24 @@ internal Resources() { } } + /// + /// Looks up a localized string similar to This node is obsolete and will be removed in a future version of Dynamo, please use the corresponding one that is OpenXML based.. + /// + internal static string ExcelInteropObsoleteNode { + get { + return ResourceManager.GetString("ExcelInteropObsoleteNode", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Use File.FromPath -> Excel.ReadFromFile node instead.. + /// + internal static string ReadObsolete { + get { + return ResourceManager.GetString("ReadObsolete", resourceCulture); + } + } + /// /// Looks up a localized string similar to The file or directory cannot be found. /// diff --git a/src/Libraries/DSOffice/Properties/Resources.en-US.resx b/src/Libraries/DSOffice/Properties/Resources.en-US.resx index c09dcdee58b..8f926b5e3e2 100644 --- a/src/Libraries/DSOffice/Properties/Resources.en-US.resx +++ b/src/Libraries/DSOffice/Properties/Resources.en-US.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + This node is obsolete and will be removed in a future version of Dynamo, please use the corresponding one that is OpenXML based. + + + Use File.FromPath -> Excel.ReadFromFile node instead. + The file or directory cannot be found diff --git a/src/Libraries/DSOffice/Properties/Resources.resx b/src/Libraries/DSOffice/Properties/Resources.resx index c09dcdee58b..8f926b5e3e2 100644 --- a/src/Libraries/DSOffice/Properties/Resources.resx +++ b/src/Libraries/DSOffice/Properties/Resources.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + This node is obsolete and will be removed in a future version of Dynamo, please use the corresponding one that is OpenXML based. + + + Use File.FromPath -> Excel.ReadFromFile node instead. + The file or directory cannot be found diff --git a/test/DynamoCoreTests/ExcelTests.cs b/test/DynamoCoreTests/ExcelTests.cs index c5b80575b69..553c8d38b8e 100644 --- a/test/DynamoCoreTests/ExcelTests.cs +++ b/test/DynamoCoreTests/ExcelTests.cs @@ -23,7 +23,7 @@ protected override void GetLibrariesToPreload(List libraries) base.GetLibrariesToPreload(libraries); } - [Test] + [Test, Category("ExcelTestInterop")] public void TestExcel() { // (1..5) + 1; diff --git a/test/Libraries/DynamoMSOfficeTests/ExcelTests.cs b/test/Libraries/DynamoMSOfficeTests/ExcelTests.cs index 6e60dbbebe5..f3c919767fc 100644 --- a/test/Libraries/DynamoMSOfficeTests/ExcelTests.cs +++ b/test/Libraries/DynamoMSOfficeTests/ExcelTests.cs @@ -60,7 +60,7 @@ public override void Cleanup() #region COM - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void ExcelAppIsClosedOnCleanup() { Assert.Inconclusive("Has trouble with sequential unit tests. Does work with single unit test, though."); @@ -79,7 +79,7 @@ public void ExcelAppIsClosedOnCleanup() #region Reading - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanGetLargeWorkbookWithinThresholdTime() { @@ -102,7 +102,7 @@ public void CanGetLargeWorkbookWithinThresholdTime() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanGetWorksheets() { @@ -124,7 +124,7 @@ public void CanGetWorksheets() Assert.AreEqual(3, mirror.GetElements().ToList().Count); } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanGetWorksheetByNameWithValidInput() { @@ -145,7 +145,7 @@ public void CanGetWorksheetByNameWithValidInput() Assert.IsNotNull(watch.CachedValue); } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void ThrowExceptionOnGetWorksheetByNameWithInvalidInput() { string openPath = Path.Combine(TestDirectory, @"core\excel\WorksheetByName_InvalidInput.dyn"); @@ -165,7 +165,7 @@ public void ThrowExceptionOnGetWorksheetByNameWithInvalidInput() Assert.IsNull(getWorksheet.CachedValue.Data); } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanReadWorksheetWithSingleColumnOfNumbers() { @@ -198,7 +198,7 @@ public void CanReadWorksheetWithSingleColumnOfNumbers() } } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanReadMultiDimensionalWorksheet() { @@ -234,7 +234,7 @@ public void CanReadMultiDimensionalWorksheet() } } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanReadWorksheetWithEmptyCellInUsedRange() { string openPath = Path.Combine(TestDirectory, @"core\excel\DataFromFile_missingCell.dyn"); @@ -251,7 +251,7 @@ public void CanReadWorksheetWithEmptyCellInUsedRange() AssertPreviewValue(watch.GUID.ToString(), data); } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanReadWorksheetWithMixedNumbersAndStrings() { @@ -273,7 +273,7 @@ public void CanReadWorksheetWithMixedNumbersAndStrings() AssertPreviewValue(watch.GUID.ToString(), data); } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void ReadOnlyFile() { //Read from readonly Excel file and make sure Excel node in Dynamo displays value correctly. @@ -291,7 +291,7 @@ public void ReadOnlyFile() AssertPreviewValue(watch.GUID.ToString(), data); } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanReadAndWriteExcel() { @@ -320,7 +320,7 @@ public void CanReadAndWriteExcel() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void ReadChangeFilename() { @@ -359,7 +359,7 @@ public void ReadChangeFilename() AssertPreviewValue(watch.GUID.ToString(), data); } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void ReadNonExistingFile() { @@ -384,7 +384,7 @@ public void ReadNonExistingFile() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanReadExcelAsStrings() { @@ -408,7 +408,7 @@ public void CanReadExcelAsStrings() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanReadEmptyCellsAsStrings() { @@ -452,7 +452,7 @@ public void CanReadEmptyCellsAsStrings() #region Writing - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanWrite1DDataOfMixedTypesToExcelWorksheet() { string openPath = Path.Combine(TestDirectory, @"core\excel\NewWorkbook_AddMixed1DData.dyn"); @@ -468,7 +468,7 @@ public void CanWrite1DDataOfMixedTypesToExcelWorksheet() AssertPreviewValue(watch.GUID.ToString(), data); } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void Excel_MAGN6872() { // http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-6872 @@ -523,7 +523,7 @@ public void Excel_MAGN6872() Assert.AreEqual(new object[] { 1.00, 2.00, 3.00, 4.00, 5.00, null, null }, dataList3); } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void Excel_OverwriteWithnull_7213() { // Overwrite the excel sheet with null values and it must work ok. @@ -546,7 +546,7 @@ public void Excel_OverwriteWithnull_7213() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void Excel_OverWriteEmptyList_MAGN7213() { @@ -569,7 +569,7 @@ public void Excel_OverWriteEmptyList_MAGN7213() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanCreateNewWorksheetInNewWorkbook() { string openPath = Path.Combine(TestDirectory, @"core\excel\NewWorkbook_AddWorksheet.dyn"); @@ -580,7 +580,7 @@ public void CanCreateNewWorksheetInNewWorkbook() Assert.IsNull(getWorksheet.CachedValue.Data); } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanAddSingleItemToExcelWorksheet() { string openPath = Path.Combine(TestDirectory, @"core\excel\NewWorkbook_AddSingleItemData.dyn"); @@ -603,8 +603,8 @@ public void CanAddSingleItemToExcelWorksheet() /// /// This test method will execute the Excel.WriteDataToExcelWorksheet method trying to write a null value in a excel file - /// - [Test, Category("ExcelTest")] + /// + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanAddNullItemToExcelWorksheet() { //Arrange @@ -623,7 +623,7 @@ public void CanAddNullItemToExcelWorksheet() Assert.IsNull(watch.CachedValue.Data); } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanAdd1DListToExcelWorksheet() { string openPath = Path.Combine(TestDirectory, @"core\excel\NewWorkbook_Add1DListData.dyn"); @@ -651,7 +651,7 @@ public void CanAdd1DListToExcelWorksheet() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanAdd2DListToExcelWorksheet() { string openPath = Path.Combine(TestDirectory, @"core\excel\NewWorkbook_Add2DListData.dyn"); @@ -681,7 +681,7 @@ public void CanAdd2DListToExcelWorksheet() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanWriteToExcelAndUpdateData() { string openPath = Path.Combine(TestDirectory, @"core\excel\WriteNodeAndUpdateData.dyn"); @@ -726,7 +726,7 @@ public void CanWriteToExcelAndUpdateData() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanWriteJaggedArrayToExcel() { string openPath = Path.Combine(TestDirectory, @"core\excel\WriteJaggedArrayToExcel.dyn"); @@ -751,7 +751,7 @@ public void CanWriteJaggedArrayToExcel() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanWriteEmptyArrayToExcel() { string openPath = Path.Combine(TestDirectory, @"core\excel\WriteEmptyArrayToExcel.dyn"); @@ -774,7 +774,7 @@ public void CanWriteEmptyArrayToExcel() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanWriteNestedEmptyListToExcel() { string openPath = Path.Combine(TestDirectory, @"core\excel\WriteNestedEmptyListToExcel.dyn"); @@ -800,7 +800,7 @@ public void CanWriteNestedEmptyListToExcel() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanWriteEmptyListToExcel() { string openPath = Path.Combine(TestDirectory, @"core\excel\WriteEmptyListToExcel.dyn"); @@ -824,7 +824,7 @@ public void CanWriteEmptyListToExcel() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanOverWriteToExcel() { string openPath = Path.Combine(TestDirectory, @"core\excel\OverWriteExcelSheet.dyn"); @@ -852,7 +852,7 @@ public void CanOverWriteToExcel() AssertPreviewValue(writeNode.GUID.ToString(), data); } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanOverWritePartiallyToExcel() { string openPath = Path.Combine(TestDirectory, @"core\excel\OverWritePartialExcelSheet.dyn"); @@ -883,7 +883,7 @@ public void CanOverWritePartiallyToExcel() AssertPreviewValue(writeNode.GUID.ToString(), data); } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanWriteNullValueToExcel() { string openPath = Path.Combine(TestDirectory, @"core\excel\WriteNullValuesToExcel.dyn"); @@ -906,7 +906,7 @@ public void CanWriteNullValueToExcel() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanWriteNullValueInListToExcel() { string openPath = Path.Combine(TestDirectory, @"core\excel\WriteNullValuesToExcel1.dyn"); @@ -928,7 +928,7 @@ public void CanWriteNullValueInListToExcel() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void TestWriteFunctionObjectToExcel() { string openPath = Path.Combine(TestDirectory, @"core\excel\WriteFunctionobject.dyn"); @@ -955,7 +955,7 @@ public void TestWriteFunctionObjectToExcel() // Empty list expected Assert.AreEqual(0, list.Count); } - [Test, Category("ExcelTest"), Category("Failure")] + [Test, Category("ExcelTestInterop"), Category("Failure")] public void WriteToNonExistingFile() { @@ -977,7 +977,7 @@ public void WriteToNonExistingFile() AssertPreviewValue(watch.GUID.ToString(), data); } - [Test, Category("ExcelTest"), Category("Failure")] + [Test, Category("ExcelTestInterop"), Category("Failure")] public void WriteNonExistingSheet() { @@ -1026,7 +1026,7 @@ public void WritenodeWithWarning() } - [Test, Category("Failure")] + [Test, Category("ExcelTestInterop"), Category("Failure")] public void WriteToReadOnlyFile() { @@ -1057,7 +1057,7 @@ public void WriteToReadOnlyFile() /// /// This will execute the Data.ImportExcel method /// - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void ImportExcelShowExcelReturnDataObjectArray() { //Arrange @@ -1079,7 +1079,7 @@ public void ImportExcelShowExcelReturnDataObjectArray() - [Test, Category("ExcelTest"), Category("Failure")] + [Test, Category("ExcelTestInterop"), Category("Failure")] public void WriteModifyFilename() { @@ -1117,7 +1117,7 @@ public void WriteModifyFilename() } - [Test, Category("ExcelTest"), Category("Failure")] + [Test, Category("ExcelTestInterop"), Category("Failure")] public void WriteModifyGraph_3() { //incomplete @@ -1157,7 +1157,7 @@ public void WriteModifyGraph_3() } - [Test, Category("ExcelTest"), Category("Failure")] + [Test, Category("ExcelTestInterop"), Category("Failure")] public void TestOverwriteToSingleSheetExcel() { string openPath = Path.Combine(TestDirectory, @"core\excel\SingleSheetOverwrite.dyn"); @@ -1184,7 +1184,7 @@ public void TestOverwriteToSingleSheetExcel() } - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanExportToExcelAsString() { // Arrange @@ -1221,7 +1221,7 @@ public void CanExportToExcelAsString() #region Saving - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void CanSaveAsWorksheet() { string openPath = Path.Combine(TestDirectory, @"core\excel\NewWorkbook_SaveAs.dyn"); @@ -1250,7 +1250,7 @@ public void CanSaveAsWorksheet() /// for an enhancement which allows "Watch.GenerateWatchViewModelForData" to be called (and /// crash without the fix). /// - [Test, Category("ExcelTest")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void Defect_MAGN_883() { string testDir = TestDirectory; @@ -1267,7 +1267,7 @@ public void Defect_MAGN_883() ViewModel.HomeSpace.Run(); Assert.Pass("RunExpression should no longer crash (Defect_MAGN_883)"); } - [Test, Category("ExcelTest"), Category("Failure")] + [Test, Category("ExcelTestInterop"), Category("Failure")] public void WriteIntoExcelVerify() { // Write Into Excel sheet using WriteToFile @@ -1317,7 +1317,7 @@ public void WriteIntoExcelVerify() /// - null /// - StackValue /// - [Test, Category("ExcelTest"), Category("Failure")] + [Test, Category("ExcelTestInterop"), Category("Failure")] public void WriteIntoExcelSeveralTypesVerify() { //Arrange @@ -1342,7 +1342,7 @@ public void WriteIntoExcelSeveralTypesVerify() } - [Test, Category("ExcelTest"), Category("Failure")] + [Test, Category("ExcelTestInterop"), Category("Failure")] public void TestFormula() { string testDir = TestDirectory; diff --git a/test/Libraries/WorkflowTests/DynamoSamples.cs b/test/Libraries/WorkflowTests/DynamoSamples.cs index 72de25d65a9..f1d7b7aa679 100644 --- a/test/Libraries/WorkflowTests/DynamoSamples.cs +++ b/test/Libraries/WorkflowTests/DynamoSamples.cs @@ -517,7 +517,7 @@ public void ImportExport_CSV_to_Stuff() } } - [Test, Category("SmokeTests")] + [Test, Category("ExcelTest"), Category("ExcelTestInterop")] public void ImportExport_Data_To_Excel() { OpenSampleModel(@"en-US\ImportExport\ImportExport_Data To Excel.dyn"); @@ -542,7 +542,7 @@ public void ImportExport_Data_To_Excel() } - [Test, Category("ExcelTest"), Category("Failure")] + [Test, Category("ExcelTestInterop"), Category("Failure")] //Todo Ritesh: Locally passing but failing on CI. //After fixing issue with this test case add Smoke Test Category. public void ImportExport_Excel_to_Dynamo() diff --git a/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs b/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs index 2cf6a6d8844..18aba5a870b 100644 --- a/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs +++ b/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs @@ -164,7 +164,7 @@ public void ProducesCorrectOutputFromCoreDirectory_preloadedbinaries() FromDirectoryCommand.HandleDocumentationFromDirectory(opts); var generatedFileNames = tempDirectory.GetFiles().Select(x => x.Name); - Assert.AreEqual(756, generatedFileNames.Count()); + Assert.AreEqual(754, generatedFileNames.Count()); } [Test]