Merge pull request #30 from stesee/develop

Adapting to new MS Excel behavior causing Exceptions with Notes on loading
Pivot Table custom captions GrandTotalCaption and DataCaption save+load

Author: stesee

.github/workflows/dotnet.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
         dotnet-version: 6.0.x
     - name: Restore dependencies
@@ -41,17 +41,21 @@ jobs:
     - name: Build
       run: dotnet build --configuration Release --no-restore
     - name: NugetPush
+      env: 
+          NUGET_TOKEN_EXISTS: ${{ secrets.NUGET_TOKEN }}
+      if:  env.NUGET_TOKEN_EXISTS != ''
       run: |
+          ls ./ClosedXML/bin/Release
           dotnet nuget push .\ClosedXML\bin\Release\*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TOKEN}} --source https://api.nuget.org/v3/index.json
-    - uses: "marvinpinto/action-automatic-releases@latest"
+    - name: GithubReleasesPush
+      uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         automatic_release_tag: ${{ env.CURRENT_VERSION }}
         prerelease: false
         title: "Release Build ${{ env.CURRENT_VERSION }}"
         files: |
           ./ClosedXML/bin/Release/*.nupkg
-          ./ClosedXML/bin/Release/*.snupkg
 
   deployTest:
     if: github.ref != 'refs/heads/main'
@@ -68,15 +72,18 @@ jobs:
     - name: Build
       run: dotnet build --configuration Release --no-restore
     - name: NugetPush
+      env: 
+          NUGET_TOKEN_EXISTS: ${{ secrets.NUGET_TEST_TOKEN }}
+      if:  env.NUGET_TOKEN_EXISTS != ''
       run: |
           ls ./ClosedXML/bin/Release
           dotnet nuget push .\ClosedXML\bin\Release\*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TEST_TOKEN}} --source https://apiint.nugettest.org/v3/index.json
-    - uses: "marvinpinto/action-automatic-releases@latest"
+    - name: GithubReleasesPush
+      uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         automatic_release_tag: "latest-prerelease"
         prerelease: true
         title: "Prerelease Build ${{ env.CURRENT_VERSION }}"
         files: |
           ./ClosedXML/bin/Release/*.nupkg
-          ./ClosedXML/bin/Release/*.snupkg

ClosedXML.Tests/Excel/Loading/LoadingTests.cs

@@ -76,6 +76,22 @@ public void CanLoadAndManipulateFileWithEmptyTable()
             }
         }
 
+        [Test]
+        public void CanLoadAndSaveCommentAsNoteWithNoTextBox()
+        {
+            using (var stream = TestHelper.GetStreamFromResource(TestHelper.GetResourcePath(@"TryToLoad\CommentAsNoteWithNoTextBox.xlsx")))
+            using (var wb = new XLWorkbook(stream))
+            {
+                var ws = wb.Worksheets.First();
+                Assert.AreEqual("Author:\r\nbla", ws.Cell("A3").GetComment().Text);
+
+                using (var ms = new MemoryStream())
+                {
+                    wb.SaveAs(ms, true);
+                }
+            }
+        }
+
         [Test]
         public void CanLoadDate1904SystemCorrectly()
         {
@@ -393,6 +409,23 @@ public void CanLoadWorksheetStyle()
             }
         }
 
+        [Test]
+        public void CanLoadNullText()
+        {
+            using (var stream = TestHelper.GetStreamFromResource(TestHelper.GetResourcePath(@"TryToLoad\TextNull.xlsx")))
+            using (var wb = new XLWorkbook(stream))
+            {
+                var ws = wb.Worksheet(1);
+                Assert.Multiple(() =>
+                {
+                    Assert.That(ws.Cell("C9").Value, Is.EqualTo(""));
+                    Assert.That(ws.Cell("A1").Value, Is.EqualTo("姓名"));
+                    Assert.That(ws.Cell("B1").Value, Is.EqualTo("年龄"));
+                    Assert.That(ws.Cell("C11").Value, Is.EqualTo("服务"));
+                });
+            }
+        }
+
         [Test]
         public void CanCorrectLoadWorkbookCellWithStringDataType()
         {

ClosedXML.Tests/Excel/PivotTables/XLPivotTableTests.cs

@@ -111,6 +111,9 @@ public void PivotTableOptionsSaveTest()
                 pt.ShowColumnStripes = true;
                 pt.Theme = XLPivotTableTheme.PivotStyleDark13;
 
+                pt.DataCaption = "Test Caption Values";
+                pt.GrandTotalCaption = "Test Grand Total Caption";
+
                 using (var ms = new MemoryStream())
                 {
                     wb.SaveAs(ms, true);
@@ -160,6 +163,40 @@ public void PivotTableOptionsSaveTest()
                         Assert.AreEqual(false, ptassert.ShowColumnHeaders, "ShowColumnHeaders save failure");
                         Assert.AreEqual(true, ptassert.ShowRowStripes, "ShowRowStripes save failure");
                         Assert.AreEqual(true, ptassert.ShowColumnStripes, "ShowColumnStripes save failure");
+                        Assert.AreEqual("Test Caption Values", ptassert.DataCaption, "DataCaption save failure");
+                        Assert.AreEqual("Test Grand Total Caption", ptassert.GrandTotalCaption, "GrandTotalCaption save failure");
+                    }
+                }
+            }
+        }
+
+        [Test]
+        public void PivotTableOptionsSaveTest_CaptionsNotSet()
+        {
+            using (var stream = TestHelper.GetStreamFromResource(TestHelper.GetResourcePath(@"Examples\PivotTables\PivotTables.xlsx")))
+            using (var wb = new XLWorkbook(stream))
+            {
+                var ws = wb.Worksheet("PastrySalesData");
+                var table = ws.Table("PastrySalesData");
+                var ptSheet = wb.Worksheets.Add("BlankPivotTable");
+                var pt = ptSheet.PivotTables.Add("pvtOptionsTest", ptSheet.Cell(1, 1), table);
+
+                pt.DataCaption = null;
+                pt.GrandTotalCaption = null;
+
+                using (var ms = new MemoryStream())
+                {
+                    wb.SaveAs(ms, true);
+
+                    ms.Position = 0;
+
+                    using (var wbassert = new XLWorkbook(ms))
+                    {
+                        var wsassert = wbassert.Worksheet("BlankPivotTable");
+                        var ptassert = wsassert.PivotTable("pvtOptionsTest");
+
+                        Assert.AreEqual("Values", ptassert.DataCaption, "DataCaption save failure");
+                        Assert.AreEqual(null, ptassert.GrandTotalCaption, "GrandTotalCaption save failure");
                     }
                 }
             }

ClosedXML.Tests/Extensions/ReflectionExtensionTests.cs

@@ -15,10 +15,16 @@ static TestClass()
             }
 
             public static int StaticProperty { get; set; }
+#pragma warning disable 0649
             public static int StaticField;
+#pragma warning restore 0649
+
+#pragma warning disable 0067
 
             public static event EventHandler<EventArgs> StaticEvent;
 
+#pragma warning restore 0067
+
             public static void StaticMethod()
             {
             }
@@ -30,10 +36,16 @@ public TestClass()
             }
 
             public int InstanceProperty { get; set; }
+#pragma warning disable 0649
             public int InstanceField;
+#pragma warning restore 0649
+
+#pragma warning disable 0067
 
             public event EventHandler<EventArgs> InstanceEvent;
 
+#pragma warning restore 0067
+
             public void InstanceMethod()
             {
             }

ClosedXML.Tests/Resource/Other/PivotTableReferenceFiles/TwoPivotTablesWithSingleSource/input.xlsx

@@ -41,6 +41,8 @@ public bool Equals(XLPivotTable x, XLPivotTable y)
 
                 && StringComparer.CurrentCulture.Equals(x.Title, y.Title)
                 && StringComparer.CurrentCulture.Equals(x.Description, y.Description)
+                && StringComparer.CurrentCulture.Equals(x.GrandTotalCaption, y.GrandTotalCaption)
+                && StringComparer.CurrentCulture.Equals(x.DataCaption, y.DataCaption)
                 && StringComparer.CurrentCulture.Equals(x.ColumnHeaderCaption, y.ColumnHeaderCaption)
                 && StringComparer.CurrentCulture.Equals(x.RowHeaderCaption, y.RowHeaderCaption)
                 && x.MergeAndCenterWithLabels.Equals(y.MergeAndCenterWithLabels)