diff --git a/ClosedXML/Excel/XLWorkbook.cs b/ClosedXML/Excel/XLWorkbook.cs
index 663249b..1177678 100644
--- a/ClosedXML/Excel/XLWorkbook.cs
+++ b/ClosedXML/Excel/XLWorkbook.cs
@@ -494,7 +494,6 @@
public void SaveAs(String file, SaveOptions options)
{
checkForWorksheetsPresent();
-
PathHelper.CreateDirectory(Path.GetDirectoryName(file));
if (_loadSource == XLLoadSource.New)
{
@@ -582,7 +581,6 @@
public void SaveAs(Stream stream, SaveOptions options)
{
checkForWorksheetsPresent();
-
if (_loadSource == XLLoadSource.New)
{
// dm 20130422, this method or better the method SpreadsheetDocument.Create which is called
diff --git a/ClosedXML_Tests/ClosedXML_Tests.csproj b/ClosedXML_Tests/ClosedXML_Tests.csproj
index 575ef0e..d6e713a 100644
--- a/ClosedXML_Tests/ClosedXML_Tests.csproj
+++ b/ClosedXML_Tests/ClosedXML_Tests.csproj
@@ -86,7 +86,7 @@
-
+
diff --git a/ClosedXML_Tests/Excel/ConditionalFormats/ConditionalFormatesCompressTests.cs b/ClosedXML_Tests/Excel/ConditionalFormats/ConditionalFormatesCompressTests.cs
deleted file mode 100644
index 9bfd39e..0000000
--- a/ClosedXML_Tests/Excel/ConditionalFormats/ConditionalFormatesCompressTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System.Linq;
-using ClosedXML.Excel;
-using NUnit.Framework;
-
-namespace ClosedXML_Tests.Excel.ConditionalFormats
-{
- [TestFixture]
- public class ConditionalFormatsCompressTests
- {
- [Test]
- public void ConsecutivelyRowsCompressTest()
- {
- var wb = new XLWorkbook();
- IXLWorksheet ws = wb.Worksheets.Add("Sheet");
-
- SetFormat1(ws.Range("B2:C2").AddConditionalFormat());
- SetFormat1(ws.Range("B4:C4").AddConditionalFormat());
- SetFormat1(ws.Range("B3:C3").AddConditionalFormat());
-
- ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
-
- Assert.AreEqual(1, ws.ConditionalFormats.Count());
- var format = ws.ConditionalFormats.First();
- Assert.AreEqual("B2:C4", format.Range.RangeAddress.ToStringRelative());
- Assert.AreEqual("F2", format.Values.Values.First().Value);
- }
-
- [Test]
- public void ConsecutivelyColumnsCompressTest()
- {
- var wb = new XLWorkbook();
- IXLWorksheet ws = wb.Worksheets.Add("Sheet");
-
- SetFormat1(ws.Range("D2:D3").AddConditionalFormat());
- SetFormat1(ws.Range("B2:B3").AddConditionalFormat());
- SetFormat1(ws.Range("C2:C3").AddConditionalFormat());
-
- ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
-
- Assert.AreEqual(1, ws.ConditionalFormats.Count());
- var format = ws.ConditionalFormats.First();
- Assert.AreEqual("B2:D3", format.Range.RangeAddress.ToStringRelative());
- Assert.AreEqual("F2", format.Values.Values.First().Value);
- }
-
- [Test]
- public void Contains1CompressTest()
- {
- var wb = new XLWorkbook();
- IXLWorksheet ws = wb.Worksheets.Add("Sheet");
-
- SetFormat1(ws.Range("B11:D12").AddConditionalFormat());
- SetFormat1(ws.Range("C12:D12").AddConditionalFormat());
-
- ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
-
- Assert.AreEqual(1, ws.ConditionalFormats.Count());
- var format = ws.ConditionalFormats.First();
- Assert.AreEqual("B11:D12", format.Range.RangeAddress.ToStringRelative());
- Assert.AreEqual("F11", format.Values.Values.First().Value);
- }
-
- [Test]
- public void Contains2CompressTest()
- {
- var wb = new XLWorkbook();
- IXLWorksheet ws = wb.Worksheets.Add("Sheet");
-
- SetFormat1(ws.Range("B14:C14").AddConditionalFormat());
- SetFormat1(ws.Range("B14:B14").AddConditionalFormat());
-
- ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
-
- Assert.AreEqual(1, ws.ConditionalFormats.Count());
- var format = ws.ConditionalFormats.First();
- Assert.AreEqual("B14:C14", format.Range.RangeAddress.ToStringRelative());
- Assert.AreEqual("F14", format.Values.Values.First().Value);
- }
-
- [Test]
- public void SuperimposedCompressTest()
- {
- var wb = new XLWorkbook();
- IXLWorksheet ws = wb.Worksheets.Add("Sheet");
-
- SetFormat1(ws.Range("B16:D18").AddConditionalFormat());
- SetFormat1(ws.Range("B18:D19").AddConditionalFormat());
-
- ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
-
- Assert.AreEqual(1, ws.ConditionalFormats.Count());
- var format = ws.ConditionalFormats.First();
- Assert.AreEqual("B16:D19", format.Range.RangeAddress.ToStringRelative());
- Assert.AreEqual("F16", format.Values.Values.First().Value);
- }
-
- [Test]
- public void DifferentRangesNoCompressTest()
- {
- var wb = new XLWorkbook();
- IXLWorksheet ws = wb.Worksheets.Add("Sheet");
-
- SetFormat1(ws.Range("B7:C7").AddConditionalFormat());
- SetFormat1(ws.Range("B8:B8").AddConditionalFormat());
- SetFormat1(ws.Range("B9:C9").AddConditionalFormat());
-
- ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
-
- Assert.AreEqual(3, ws.ConditionalFormats.Count());
- }
-
- [Test]
- public void DifferentFormatNoCompressTest()
- {
- var wb = new XLWorkbook();
- IXLWorksheet ws = wb.Worksheets.Add("Sheet");
-
- SetFormat1(ws.Range("B11:D12").AddConditionalFormat());
- SetFormat2(ws.Range("C12:D12").AddConditionalFormat());
-
- ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
-
- Assert.AreEqual(2, ws.ConditionalFormats.Count());
- }
-
- private static void SetFormat1(IXLConditionalFormat format)
- {
- format.WhenEquals("="+format.Range.FirstCell().CellRight(4).Address.ToStringRelative()).Fill.SetBackgroundColor(XLColor.Blue);
- }
-
- private static void SetFormat2(IXLConditionalFormat format)
- {
- format.WhenEquals(5).Fill.SetBackgroundColor(XLColor.AliceBlue);
- }
- }
-}
diff --git a/ClosedXML_Tests/Excel/ConditionalFormats/ConditionalFormatsConsolidateTests.cs b/ClosedXML_Tests/Excel/ConditionalFormats/ConditionalFormatsConsolidateTests.cs
new file mode 100644
index 0000000..222fbeb
--- /dev/null
+++ b/ClosedXML_Tests/Excel/ConditionalFormats/ConditionalFormatsConsolidateTests.cs
@@ -0,0 +1,136 @@
+using System.Linq;
+using ClosedXML.Excel;
+using NUnit.Framework;
+
+namespace ClosedXML_Tests.Excel.ConditionalFormats
+{
+ [TestFixture]
+ public class ConditionalFormatsConsolidateTests
+ {
+ [Test]
+ public void ConsecutivelyRowsConsolidateTest()
+ {
+ var wb = new XLWorkbook();
+ IXLWorksheet ws = wb.Worksheets.Add("Sheet");
+
+ SetFormat1(ws.Range("B2:C2").AddConditionalFormat());
+ SetFormat1(ws.Range("B4:C4").AddConditionalFormat());
+ SetFormat1(ws.Range("B3:C3").AddConditionalFormat());
+
+ ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
+
+ Assert.AreEqual(1, ws.ConditionalFormats.Count());
+ var format = ws.ConditionalFormats.First();
+ Assert.AreEqual("B2:C4", format.Range.RangeAddress.ToStringRelative());
+ Assert.AreEqual("F2", format.Values.Values.First().Value);
+ }
+
+ [Test]
+ public void ConsecutivelyColumnsConsolidateTest()
+ {
+ var wb = new XLWorkbook();
+ IXLWorksheet ws = wb.Worksheets.Add("Sheet");
+
+ SetFormat1(ws.Range("D2:D3").AddConditionalFormat());
+ SetFormat1(ws.Range("B2:B3").AddConditionalFormat());
+ SetFormat1(ws.Range("C2:C3").AddConditionalFormat());
+
+ ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
+
+ Assert.AreEqual(1, ws.ConditionalFormats.Count());
+ var format = ws.ConditionalFormats.First();
+ Assert.AreEqual("B2:D3", format.Range.RangeAddress.ToStringRelative());
+ Assert.AreEqual("F2", format.Values.Values.First().Value);
+ }
+
+ [Test]
+ public void Contains1ConsolidateTest()
+ {
+ var wb = new XLWorkbook();
+ IXLWorksheet ws = wb.Worksheets.Add("Sheet");
+
+ SetFormat1(ws.Range("B11:D12").AddConditionalFormat());
+ SetFormat1(ws.Range("C12:D12").AddConditionalFormat());
+
+ ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
+
+ Assert.AreEqual(1, ws.ConditionalFormats.Count());
+ var format = ws.ConditionalFormats.First();
+ Assert.AreEqual("B11:D12", format.Range.RangeAddress.ToStringRelative());
+ Assert.AreEqual("F11", format.Values.Values.First().Value);
+ }
+
+ [Test]
+ public void Contains2ConsolidateTest()
+ {
+ var wb = new XLWorkbook();
+ IXLWorksheet ws = wb.Worksheets.Add("Sheet");
+
+ SetFormat1(ws.Range("B14:C14").AddConditionalFormat());
+ SetFormat1(ws.Range("B14:B14").AddConditionalFormat());
+
+ ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
+
+ Assert.AreEqual(1, ws.ConditionalFormats.Count());
+ var format = ws.ConditionalFormats.First();
+ Assert.AreEqual("B14:C14", format.Range.RangeAddress.ToStringRelative());
+ Assert.AreEqual("F14", format.Values.Values.First().Value);
+ }
+
+ [Test]
+ public void SuperimposedConsolidateTest()
+ {
+ var wb = new XLWorkbook();
+ IXLWorksheet ws = wb.Worksheets.Add("Sheet");
+
+ SetFormat1(ws.Range("B16:D18").AddConditionalFormat());
+ SetFormat1(ws.Range("B18:D19").AddConditionalFormat());
+
+ ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
+
+ Assert.AreEqual(1, ws.ConditionalFormats.Count());
+ var format = ws.ConditionalFormats.First();
+ Assert.AreEqual("B16:D19", format.Range.RangeAddress.ToStringRelative());
+ Assert.AreEqual("F16", format.Values.Values.First().Value);
+ }
+
+ [Test]
+ public void DifferentRangesNoConsolidateTest()
+ {
+ var wb = new XLWorkbook();
+ IXLWorksheet ws = wb.Worksheets.Add("Sheet");
+
+ SetFormat1(ws.Range("B7:C7").AddConditionalFormat());
+ SetFormat1(ws.Range("B8:B8").AddConditionalFormat());
+ SetFormat1(ws.Range("B9:C9").AddConditionalFormat());
+
+ ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
+
+ Assert.AreEqual(3, ws.ConditionalFormats.Count());
+ }
+
+ [Test]
+ public void DifferentFormatNoConsolidateTest()
+ {
+ var wb = new XLWorkbook();
+ IXLWorksheet ws = wb.Worksheets.Add("Sheet");
+
+ SetFormat1(ws.Range("B11:D12").AddConditionalFormat());
+ SetFormat2(ws.Range("C12:D12").AddConditionalFormat());
+
+ ((XLConditionalFormats)ws.ConditionalFormats).Consolidate();
+
+ Assert.AreEqual(2, ws.ConditionalFormats.Count());
+ }
+
+ private static void SetFormat1(IXLConditionalFormat format)
+ {
+ format.WhenEquals("="+format.Range.FirstCell().CellRight(4).Address.ToStringRelative()).Fill.SetBackgroundColor(XLColor.Blue);
+ }
+
+ private static void SetFormat2(IXLConditionalFormat format)
+ {
+ format.WhenEquals(5).Fill.SetBackgroundColor(XLColor.AliceBlue);
+ }
+ }
+}