diff --git a/ClosedXML_Tests/Excel/Columns/ColumnTests.cs b/ClosedXML_Tests/Excel/Columns/ColumnTests.cs index 0a98c4f..aa28593 100644 --- a/ClosedXML_Tests/Excel/Columns/ColumnTests.cs +++ b/ClosedXML_Tests/Excel/Columns/ColumnTests.cs @@ -108,7 +108,7 @@ IXLColumn columnIns = ws.Column(2).InsertColumnsBefore(1).First(); string outputPath = Path.Combine(TestHelper.TestsOutputDirectory, @"ForTesting\Sandbox.xlsx"); - wb.SaveAs(outputPath); + wb.SaveAs(outputPath, true); Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(1).Style.Fill.BackgroundColor); Assert.AreEqual(XLColor.Red, ws.Column(1).Cell(2).Style.Fill.BackgroundColor); @@ -237,4 +237,4 @@ Assert.AreEqual(2, lastCoUsed); } } -} \ No newline at end of file +} diff --git a/ClosedXML_Tests/Excel/PageSetup/HeaderFooterTests.cs b/ClosedXML_Tests/Excel/PageSetup/HeaderFooterTests.cs index d1748a9..18fe221 100644 --- a/ClosedXML_Tests/Excel/PageSetup/HeaderFooterTests.cs +++ b/ClosedXML_Tests/Excel/PageSetup/HeaderFooterTests.cs @@ -17,7 +17,7 @@ ws.PageSetup.Header.Center.AddText("Initial page header", XLHFOccurrence.EvenPages); var ms = new MemoryStream(); - wb.SaveAs(ms); + wb.SaveAs(ms, true); wb = new XLWorkbook(ms); ws = wb.Worksheets.First(); @@ -25,7 +25,7 @@ ws.PageSetup.Header.Center.Clear(); ws.PageSetup.Header.Center.AddText("Changed header", XLHFOccurrence.EvenPages); - wb.SaveAs(ms); + wb.SaveAs(ms, true); wb = new XLWorkbook(ms); ws = wb.Worksheets.First(); @@ -34,4 +34,4 @@ Assert.AreEqual("Changed header", newHeader); } } -} \ No newline at end of file +} diff --git a/ClosedXML_Tests/Excel/Ranges/XLRangeBaseTests.cs b/ClosedXML_Tests/Excel/Ranges/XLRangeBaseTests.cs index c90f624..22bd7c6 100644 --- a/ClosedXML_Tests/Excel/Ranges/XLRangeBaseTests.cs +++ b/ClosedXML_Tests/Excel/Ranges/XLRangeBaseTests.cs @@ -178,7 +178,7 @@ // ws.NamedRanges.Add("TestRange", "\"Hello\""); // using (MemoryStream memoryStream = new MemoryStream()) // { - // wb.SaveAs(memoryStream); + // wb.SaveAs(memoryStream, true); // var wb2 = new XLWorkbook(memoryStream); // var text = wb2.Worksheet("Sheet1").NamedRanges.First() // memoryStream.Close(); @@ -187,4 +187,4 @@ //} } -} \ No newline at end of file +} diff --git a/ClosedXML_Tests/Excel/Tables/TablesTests.cs b/ClosedXML_Tests/Excel/Tables/TablesTests.cs index 7ebf9bc..c5c392b 100644 --- a/ClosedXML_Tests/Excel/Tables/TablesTests.cs +++ b/ClosedXML_Tests/Excel/Tables/TablesTests.cs @@ -31,7 +31,7 @@ wb.AddWorksheet(dt); using (var ms = new MemoryStream()) - wb.SaveAs(ms); + wb.SaveAs(ms, true); } [Test] @@ -43,7 +43,7 @@ ws.Range("A1").CreateTable(); using (var ms = new MemoryStream()) - wb.SaveAs(ms); + wb.SaveAs(ms, true); } [Test] @@ -85,7 +85,7 @@ ws.RangeUsed().CreateTable(); using (var ms = new MemoryStream()) { - wb.SaveAs(ms); + wb.SaveAs(ms, true); var wb2 = new XLWorkbook(ms); IXLWorksheet ws2 = wb2.Worksheet(1); IXLTable table2 = ws2.Table(0); @@ -115,7 +115,7 @@ using (var ms = new MemoryStream()) { - wb.SaveAs(ms); + wb.SaveAs(ms, true); var wb2 = new XLWorkbook(ms); IXLWorksheet ws2 = wb2.Worksheet(1); IXLTable table2 = ws2.Table(0); @@ -177,13 +177,9 @@ row = table.DataRange.InsertRowsAbove(1).First(); row.Field("Value").Value = 1; - //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx"); - Assert.AreEqual(1, ws.Cell(2, 1).GetDouble()); Assert.AreEqual(2, ws.Cell(3, 1).GetDouble()); Assert.AreEqual(3, ws.Cell(4, 1).GetDouble()); - - //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx"); } [Test] @@ -196,20 +192,17 @@ IXLTable table = ws.Range("A1:A2").CreateTable(); table.SetShowTotalsRow() .Field(0).TotalsRowFunction = XLTotalsRowFunction.Sum; - //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox1.xlsx"); + IXLTableRow row = table.DataRange.FirstRow(); row.Field("Value").Value = 3; row = row.InsertRowsAbove(1).First(); row.Field("Value").Value = 2; row = row.InsertRowsAbove(1).First(); row.Field("Value").Value = 1; - //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox2.xlsx"); Assert.AreEqual(1, ws.Cell(2, 1).GetDouble()); Assert.AreEqual(2, ws.Cell(3, 1).GetDouble()); Assert.AreEqual(3, ws.Cell(4, 1).GetDouble()); - - //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx"); } [Test] @@ -230,8 +223,6 @@ row = table.DataRange.InsertRowsBelow(1).First(); row.Field("Value").Value = 3; - //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx"); - Assert.AreEqual(1, ws.Cell(2, 1).GetDouble()); Assert.AreEqual(2, ws.Cell(3, 1).GetDouble()); Assert.AreEqual(3, ws.Cell(4, 1).GetDouble()); @@ -258,8 +249,6 @@ Assert.AreEqual(1, ws.Cell(2, 1).GetDouble()); Assert.AreEqual(2, ws.Cell(3, 1).GetDouble()); Assert.AreEqual(3, ws.Cell(4, 1).GetDouble()); - - //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox.xlsx"); } [Test] @@ -276,8 +265,6 @@ IXLTable table = ws.Tables.First(); - //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox1.xlsx"); - Assert.IsTrue(ws.Cell(1, 1).IsEmpty(true)); Assert.AreEqual(null, table.HeadersRow()); Assert.AreEqual("A", table.DataRange.FirstRow().Field("Categories").GetString()); @@ -296,9 +283,6 @@ ws.FirstCell().SetValue("x"); table.SetShowHeaderRow(); - //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox2.xlsx"); - - //wb.SaveAs(@"D:\Excel Files\ForTesting\Sandbox3.xlsx"); Assert.AreEqual("x", ws.FirstCell().GetString()); Assert.AreEqual("Categories", ws.Cell("A2").GetString()); @@ -333,4 +317,4 @@ Assert.AreEqual("LastName", cellValue); } } -} \ No newline at end of file +} diff --git a/ClosedXML_Tests/TestHelper.cs b/ClosedXML_Tests/TestHelper.cs index be509a2..07576df 100644 --- a/ClosedXML_Tests/TestHelper.cs +++ b/ClosedXML_Tests/TestHelper.cs @@ -19,22 +19,22 @@ //Note: Run example tests parameters public static string TestsOutputDirectory { - get { - return Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); + get { + return Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); } } public const string ActualTestResultPostFix = ""; public static readonly string TestsExampleOutputDirectory = Path.Combine(TestsOutputDirectory, "Examples"); - + private const bool CompareWithResources = true; private static readonly ResourceFileExtractor _extractor = new ResourceFileExtractor(null, ".Resource.Examples."); public static void SaveWorkbook(XLWorkbook workbook, string fileName) { - workbook.SaveAs(Path.Combine(TestsOutputDirectory, fileName)); + workbook.SaveAs(Path.Combine(TestsOutputDirectory, fileName), true); } public static void RunTestExample(string filePartName) @@ -57,7 +57,7 @@ var filePath2 = Path.Combine(directory, fileName); //Run test example.Create(filePath1); - new XLWorkbook(filePath1).SaveAs(filePath2); + new XLWorkbook(filePath1).SaveAs(filePath2, true); bool success = true; #pragma warning disable 162 try @@ -102,4 +102,4 @@ } } } -} \ No newline at end of file +}