SC-66: Rename test project on ShapeCrawler.Tests

ShapeCrawler.Tests.Unit/ChartPointTests.cs → ShapeCrawler.Tests/ChartPointTests.cs

@@ -3,12 +3,12 @@
 using System.Linq;
 using FluentAssertions;
 using ShapeCrawler.Charts;
-using ShapeCrawler.Tests.Unit.Helpers;
+using ShapeCrawler.Tests.Helpers;
 using Xunit;
 // ReSharper disable SuggestVarOrType_BuiltInTypes
 // ReSharper disable SuggestVarOrType_SimpleTypes
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     public class ChartPointTests : ShapeCrawlerTest, IClassFixture<PresentationFixture>
     {
@@ -103,9 +103,8 @@ public void Value_Setter_updates_chart_point(string filename, int slideNumber, s
 
             // Assert
             point.Value.Should().Be(newChartPointValue);
-
-            var stream = new MemoryStream();
-            presentation.SaveAs(stream);
+
+            presentation = SaveAndOpenPresentation(presentation);
             chart = presentation.Slides[slideNumber].Shapes.GetByName<IChart>(shapeName);
             point = chart.SeriesCollection[0].Points[0];
             point.Value.Should().Be(newChartPointValue);
@@ -116,6 +115,7 @@ public static IEnumerable<object[]> TestCasesValueSetter()
             yield return new object[] {"024_chart.pptx", 3, "Chart 4"};
             yield return new object[] {"009_table.pptx", 3, "Chart 5"};
             yield return new object[] {"charts-case001.pptx", 1, "chart"};
+            yield return new object[] {"charts-case002.pptx", 1, "Chart 1"};
             yield return new object[] {"002.pptx", 1, "Chart 8"};
             yield return new object[] {"021.pptx", 2, "Chart 3"};
         }

ShapeCrawler.Tests.Unit/ChartTests.cs → ShapeCrawler.Tests/ChartTests.cs

@@ -6,15 +6,15 @@
 using FluentAssertions;
 using ShapeCrawler.Charts;
 using ShapeCrawler.Factories;
-using ShapeCrawler.Tests.Unit.Helpers;
-using ShapeCrawler.Tests.Unit.Properties;
+using ShapeCrawler.Tests.Helpers;
+using ShapeCrawler.Tests.Properties;
 using Xunit;
 
 // ReSharper disable TooManyDeclarations
 // ReSharper disable InconsistentNaming
 // ReSharper disable TooManyChainedReferences
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     [SuppressMessage("ReSharper", "SuggestVarOrType_SimpleTypes")]
     [SuppressMessage("ReSharper", "SuggestVarOrType_BuiltInTypes")]

ShapeCrawler.Tests.Unit/ColorFormatTests.cs → ShapeCrawler.Tests/ColorFormatTests.cs

@@ -4,11 +4,11 @@
 using System.Linq;
 using FluentAssertions;
 using ShapeCrawler.Drawing;
-using ShapeCrawler.Tests.Unit.Helpers;
-using ShapeCrawler.Tests.Unit.Properties;
+using ShapeCrawler.Tests.Helpers;
+using ShapeCrawler.Tests.Properties;
 using Xunit;
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     public class ColorFormatTests : IClassFixture<PresentationFixture>
     {

ShapeCrawler.Tests.Unit/FontTests.cs → ShapeCrawler.Tests/FontTests.cs

@@ -5,12 +5,12 @@
 using FluentAssertions;
 using ShapeCrawler.AutoShapes;
 using ShapeCrawler.Exceptions;
-using ShapeCrawler.Tests.Unit.Helpers;
-using ShapeCrawler.Tests.Unit.Properties;
+using ShapeCrawler.Tests.Helpers;
+using ShapeCrawler.Tests.Properties;
 using Xunit;
 // ReSharper disable SuggestVarOrType_SimpleTypes
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     public class FontTests : IClassFixture<PresentationFixture>
     {

ShapeCrawler.Tests.Unit/Helpers/PptxValidator.cs → ShapeCrawler.Tests/Helpers/PptxValidator.cs

@@ -6,7 +6,7 @@
 using System.Xml.Linq;
 using SharpCompress.Common;
 
-namespace ShapeCrawler.Tests.Unit.Helpers
+namespace ShapeCrawler.Tests.Helpers
 {
     public class PptxValidator
     {

ShapeCrawler.Tests.Unit/Helpers/PresentationFixture.cs → ShapeCrawler.Tests/Helpers/PresentationFixture.cs

@@ -1,4 +1,4 @@
-namespace ShapeCrawler.Tests.Unit.Helpers
+namespace ShapeCrawler.Tests.Helpers
 {
     public class PresentationFixture
     {

ShapeCrawler.Tests.Unit/Helpers/SlideElementQuery.cs → ShapeCrawler.Tests/Helpers/SlideElementQuery.cs

@@ -1,4 +1,4 @@
-namespace ShapeCrawler.Tests.Unit.Helpers
+namespace ShapeCrawler.Tests.Helpers
 {
     public class SlideElementQuery
     {

ShapeCrawler.Tests.Unit/Helpers/TestFiles.cs → ShapeCrawler.Tests/Helpers/TestFiles.cs

@@ -1,7 +1,7 @@
 using System.IO;
-using ShapeCrawler.Tests.Unit.Properties;
+using ShapeCrawler.Tests.Properties;
 
-namespace ShapeCrawler.Tests.Unit.Helpers
+namespace ShapeCrawler.Tests.Helpers
 {
     public static class TestFiles
     {

ShapeCrawler.Tests.Unit/Helpers/TestHelper.cs → ShapeCrawler.Tests/Helpers/TestHelper.cs

@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Reflection;
 
-namespace ShapeCrawler.Tests.Unit.Helpers
+namespace ShapeCrawler.Tests.Helpers
 {
     public static class TestHelper
     {

ShapeCrawler.Tests.Unit/ParagraphPortionTests.cs → ShapeCrawler.Tests/ParagraphPortionTests.cs

@@ -8,15 +8,15 @@
 using ShapeCrawler.Collections;
 using ShapeCrawler.Exceptions;
 using ShapeCrawler.Tables;
-using ShapeCrawler.Tests.Unit.Helpers;
-using ShapeCrawler.Tests.Unit.Properties;
+using ShapeCrawler.Tests.Helpers;
+using ShapeCrawler.Tests.Properties;
 using Xunit;
 
 // ReSharper disable All
 // ReSharper disable TooManyChainedReferences
 // ReSharper disable TooManyDeclarations
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     public class ParagraphPortionTests : IClassFixture<PresentationFixture>
     {

ShapeCrawler.Tests.Unit/PictureTests.cs → ShapeCrawler.Tests/PictureTests.cs

@@ -2,13 +2,13 @@
 using System.IO;
 using System.Linq;
 using FluentAssertions;
-using ShapeCrawler.Tests.Unit.Helpers;
+using ShapeCrawler.Tests.Helpers;
 using Xunit;
 
 // ReSharper disable TooManyChainedReferences
 // ReSharper disable TooManyDeclarations
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     public class PictureTests : IClassFixture<PresentationFixture>
     {

ShapeCrawler.Tests.Unit/PlaceholderDataTests.cs → ShapeCrawler.Tests/PlaceholderDataTests.cs

@@ -3,7 +3,7 @@
 
 // ReSharper disable TooManyDeclarations
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     /// <summary>
     /// Represents test for <see cref="PlaceholderLocationData"/> class APIs.

ShapeCrawler.Tests.Unit/PresentationTests.cs → ShapeCrawler.Tests/PresentationTests.cs

@@ -6,10 +6,10 @@
 using ShapeCrawler.Exceptions;
 using ShapeCrawler.Factories;
 using ShapeCrawler.Statics;
-using ShapeCrawler.Tests.Unit.Helpers;
+using ShapeCrawler.Tests.Helpers;
 using Xunit;
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     public class PresentationTests : IClassFixture<PresentationFixture>
     {

ShapeCrawler.Tests.Unit/ShapeCrawler.Tests.Unit.csproj → ShapeCrawler.Tests/ShapeCrawler.Tests.csproj

@@ -69,6 +69,8 @@
     <EmbeddedResource Include="Resource\Charts\charts-case001.pptx" />
     <None Remove="Resource\002.pptx" />
     <EmbeddedResource Include="Resource\002.pptx" />
+    <None Remove="Resource\Charts\charts-case002.pptx" />
+    <EmbeddedResource Include="Resource\Charts\charts-case002.pptx" />
   </ItemGroup>
 
 </Project>

ShapeCrawler.Tests.Unit/ShapeCrawlerTest.cs → ShapeCrawler.Tests/ShapeCrawlerTest.cs

@@ -4,7 +4,7 @@
 using System.Reflection;
 using ClosedXML.Excel;
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     public abstract class ShapeCrawlerTest
     {

ShapeCrawler.Tests.Unit/ShapeTests.cs → ShapeCrawler.Tests/ShapeTests.cs

@@ -7,15 +7,15 @@
 using ShapeCrawler.Drawing;
 using ShapeCrawler.OLEObjects;
 using ShapeCrawler.Shapes;
-using ShapeCrawler.Tests.Unit.Helpers;
-using ShapeCrawler.Tests.Unit.Properties;
+using ShapeCrawler.Tests.Helpers;
+using ShapeCrawler.Tests.Properties;
 using Xunit;
 
 // ReSharper disable TooManyDeclarations
 // ReSharper disable InconsistentNaming
 // ReSharper disable TooManyChainedReferences
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     public class ShapeTests : ShapeCrawlerTest, IClassFixture<PresentationFixture>
     {

ShapeCrawler.Tests.Unit/SlideMasterTests.cs → ShapeCrawler.Tests/SlideMasterTests.cs

@@ -1,10 +1,10 @@
 using System.Linq;
 using FluentAssertions;
 using ShapeCrawler.Shapes;
-using ShapeCrawler.Tests.Unit.Helpers;
+using ShapeCrawler.Tests.Helpers;
 using Xunit;
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     public class SlideMasterTests : IClassFixture<PresentationFixture>
     {

ShapeCrawler.Tests.Unit/SlideTests.cs → ShapeCrawler.Tests/SlideTests.cs

@@ -4,15 +4,15 @@
 using System.Linq;
 using FluentAssertions;
 using ShapeCrawler.Shapes;
-using ShapeCrawler.Tests.Unit.Helpers;
+using ShapeCrawler.Tests.Helpers;
 using ShapeCrawler.Video;
 using Xunit;
 
 // ReSharper disable SuggestVarOrType_BuiltInTypes
 // ReSharper disable TooManyChainedReferences
 // ReSharper disable TooManyDeclarations
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     [SuppressMessage("ReSharper", "SuggestVarOrType_SimpleTypes")]
     public class SlideTests : ShapeCrawlerTest, IClassFixture<PresentationFixture>

ShapeCrawler.Tests.Unit/TableTests.cs → ShapeCrawler.Tests/TableTests.cs

@@ -6,11 +6,11 @@
 using FluentAssertions;
 using ShapeCrawler.Collections;
 using ShapeCrawler.Tables;
-using ShapeCrawler.Tests.Unit.Helpers;
-using ShapeCrawler.Tests.Unit.Properties;
+using ShapeCrawler.Tests.Helpers;
+using ShapeCrawler.Tests.Properties;
 using Xunit;
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     [SuppressMessage("ReSharper", "SuggestVarOrType_SimpleTypes")]
     [SuppressMessage("ReSharper", "SuggestVarOrType_BuiltInTypes")]

ShapeCrawler.Tests.Unit/TextBoxTests.cs → ShapeCrawler.Tests/TextBoxTests.cs

@@ -10,15 +10,15 @@
 using ShapeCrawler.Exceptions;
 using ShapeCrawler.Shapes;
 using ShapeCrawler.Statics;
-using ShapeCrawler.Tests.Unit.Helpers;
-using ShapeCrawler.Tests.Unit.Properties;
+using ShapeCrawler.Tests.Helpers;
+using ShapeCrawler.Tests.Properties;
 using Xunit;
 
 // ReSharper disable All
 // ReSharper disable TooManyChainedReferences
 // ReSharper disable TooManyDeclarations
 
-namespace ShapeCrawler.Tests.Unit
+namespace ShapeCrawler.Tests
 {
     public class TextBoxTests : ShapeCrawlerTest, IClassFixture<PresentationFixture>
     {

ShapeCrawler.sln

@@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShapeCrawler", "ShapeCrawler\ShapeCrawler.csproj", "{4A633D84-856C-49A3-A76E-59291CF76A6F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShapeCrawler.Tests.Unit", "ShapeCrawler.Tests.Unit\ShapeCrawler.Tests.Unit.csproj", "{72CE74E1-91AF-4F35-AA2A-C925B84B0CB9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShapeCrawler.Tests", "ShapeCrawler.Tests\ShapeCrawler.Tests.csproj", "{72CE74E1-91AF-4F35-AA2A-C925B84B0CB9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

ShapeCrawler/Charts/ChartWorkbook.cs

@@ -47,6 +47,15 @@ internal X.Cell GetXCell(string sheetName, string cellAddress)
 
             return sheetXCells.First(xCell => xCell.CellReference == cellAddress);
         }
+
+        internal X.Cell? GetXCellOrDefault(string sheetName, string cellAddress)
+        {
+            var chartSheet = this.WorkbookPart.Workbook.Sheets!.Elements<X.Sheet>().First(xSheet => xSheet.Name == sheetName);
+            var worksheetPart = (WorksheetPart)this.WorkbookPart.GetPartById(chartSheet.Id!);
+            var sheetXCells = worksheetPart.Worksheet.Descendants<X.Cell>();
+
+            return sheetXCells.FirstOrDefault(xCell => xCell.CellReference == cellAddress);
+        }
 
         private SpreadsheetDocument GetSpreadsheetDocument()
         {

ShapeCrawler/Charts/IChartPoint.cs

@@ -84,7 +84,7 @@ private void UpdateValue(double value)
                 return;
             }
 
-            var xCell = this.parentChart.ChartWorkbook.GetXCell(this.sheetName, this.address);
+            var xCell = this.parentChart.ChartWorkbook.GetXCellOrDefault(this.sheetName, this.address);
             xCell.DataType = new EnumValue<X.CellValues>(X.CellValues.Number);
             xCell.CellValue = new X.CellValue(value);
         }